Merge Conflict
Merge branch 'master' of https://github.com/ZakCollins/Lab3

Conflicts:
	README.txt
Merge branch 'master' of https://github.com/ZakCollins/Lab3

Conflicts:
	README.txt