LEVELS! (sorry it's a bit late, I had to manually merge our files together before pushing :/)
Merge branch 'master' of github.com:lju/Homework1

Conflicts:
	Homework1
Levels! and hopefully merging... (3rd times the charm?)