getting stuff done
Merge branch 'master' of https://github.com/jarnm04/csci3308

Conflicts:
	README.md