dashboard
Merge branch 'master' of https://github.com/Opportunity-Hack-San-Jose-2014/Team3

Conflicts:
	routes/index.js