merge
Merge branch 'master' of https://github.com/lhbt/HackManchester
git dashboard style
Merge branch 'master' of https://github.com/lhbt/HackManchester

Conflicts:
	Heisenberg/App/Dashboard/Dashboard.js
fix merge