fixed bugg where you have to refresh page to get js to work
Merge branch 'master' of https://github.com/OscarFalcon/Flare
Merge branch 'master' of https://github.com/OscarFalcon/Flare