ignore build files
Merge branch 'master' of github.com:justbuchanan/cs2340

Conflicts:
	.gitignore
Merge branch 'master' of github.com:justbuchanan/cs2340

Conflicts:
	.gitignore