login stuff
Merge branch 'master' of https://github.com/toom1984/www

Conflicts:
	js/loadScripts.js