oo
Merge branch 'master' of github.com:Jamiltz/website

Conflicts:
	dev/src/app/account/account.js
	dev/src/app/app.js
	dev/src/app/signup/signup.js