fixing the merges
Merge branch 'master' of https://github.com/paulcox24/whatsgood
Merge branch 'master' of https://github.com/paulcox24/whatsgood
added stuff, maps are slightly more bettah, needs moar work
Merge branch 'master' of https://github.com/paulcox24/whatsgood
solved merge conflicts in static controller
Merge pull request #48 from djmrr/mike/mapinteractive_redo

Mike/mapinteractive redo