added stuff
Merge branch 'master' of github.com:VoltronForceV/attaboy

Conflicts:
	app.js
	models/user.js