:(
Merge branch 'master' of https://github.com/AustinWatersUNT/CSCE3600

Conflicts:
	README.md