Initial
Merge branch 'master' of github.com:plusbzz/cs276-pa3

Conflicts:
	.gitignore