rearranged some stuff, added a few things, wrote a useless commit message
Merge branch 'master' of github.com:bmaddy/beginners-night