3 commits

Author	SHA1	Message	Date
Michael Zhang	21e274d1b2	merge .gitignore	2015-12-21 01:04:48 -06:00
Michael Zhang	e6b2e45848	basic setup	2015-12-21 01:04:00 -06:00
James Wang	8cc3cbc756	Add .gitignore	2015-12-21 00:55:00 -05:00