garh
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/app/controllers/home.js
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
made a little more progress with pulling data from db