commiting my changes before merge
Merge branch 'master' of https://github.com/OscarFalcon/Flare

Merging login.js