making sure everything is up to date
Merge branch 'master' of https://github.com/xinecoulter/SolarEyes
fixing compliling issues on heroku
trying to fix timeout
added icons
added icon assets
added icon assets
fixed asset path
fixed asset path
fixed asset path
fixed asset path
fixed asset path