setting up simple app.js
Merge branch 'master' into working

Conflicts:
	app.js
latest updates to whutzup app
add signup page