bootstrap columns not working
Merge branch 'master' of https://github.com/lhbt/HackManchester

Conflicts:
	Heisenberg/App/Partials/Dashboard.html