Controllers and templates
WIP
Merge branch 'master' of https://github.com/tomasbasham/vinternships