forgot some stuff
Merge branch 'master' of github.com:vegarang/the_academy