changed signup.js
Merge branch 'master' of https://github.com/omfgitsjack/justplay

Conflicts:
	public/app/modules/signup/signup.js
resolved signup.js conflict