Added a bunch of stuff
Merge branch 'master' of github.com:meekrab/handin01-11069

This is amazing