Working api other than text not going into mongodb
Merge remote-tracking branch 'origin/master'

Conflicts:
	app.js
Fixed so now its angular and jade only