Don't put the API key in the application HTML marty :(
Resolve conflict
Merge branch 'master' of github.com:Govhack-RoRo/GovTroll
Merge branch 'master' of github.com:Govhack-RoRo/GovTroll
Merge branch 'master' of github.com:Govhack-RoRo/GovTroll