hi
Merge branch 'master' of https://github.com/sbryb/cs5560-project.git

Conflicts:
	.gitignore