Update
Merge branch 'master' of github.com:MrJack91/infexercises

Conflicts:
	exercise_1.pdf