Application logic
Merge branch 'master' of https://github.com/tomasbasham/vinternships

Conflicts:
	vinternships/vinternships/views.py