added profile-screen
Merge branch 'master' of github.com:johaasi/High8

Conflicts:
	js/app.js
Merge branch 'master' of github.com:johaasi/High8

Conflicts:
	js/app.js