Initial commit
init starter code
init start code
Merge branch 'master' of https://github.com/chiem14/cs376Proj

Conflicts:
	.gitignore