Merge branch 'master' of https://github.com/kbarre123/csc_1350

Conflicts:
	.gitignore