:wq
Commit - Merge branch 'master' of https://github.com/Birfudgees/csc344

Conflicts:
	README.md
Merge branch 'master' of https://github.com/Birfudgees/csc344

Conflicts:
	README.md