Initial commit
Merge https://github.com/CS254Project6/mainRepository

Conflicts:
	README.md