last minute bugfix? might actually work this time though :D
Merge branch 'master' of github.com:vegarang/the_academy