login bug fixes
Merge branch 'master' of https://github.com/IPIRI-RSSH/Skrolls

Conflicts:
	app/index.html
	app/views/skroll.html
Merge pull request #2 from IPIRI-RSSH/master

bug fixes
Merge branch 'master' of https://github.com/ne0n666/Skrolls
Merge pull request #32 from ne0n666/master

Some fixes