Work on question 2
Merge branch 'master' of https://github.com/JordanToering/MushroomKingdom

Conflicts:
	Assignments/Assignment 1/assign_1.tex