In theory this works!
Merge branch 'master' of https://github.com/Warhawk94/fb_hackday_sept_2013

Conflicts:
	dashboard.html
Merge branch 'master' of https://github.com/Warhawk94/fb_hackday_sept_2013