Merge pull request #18 from djonsson/master

Merge
Updated readme.md with new instatllation instructions
Rearranged readme.md
Added check to see if we are on the login page
Merge pull request #19 from djonsson/develop

Updated readme.md and bugfix #17