Merge pull request #2 from AngelaCrisanti/master

Fix error while login, require cannot parse JSON while it has a commented line
adding layout