Merge pull request #8 from KhalidRich/yelp

Map implimented
Fixed yelp search, added lots of yummy controller variables, set up map stuff
Merge branch 'master' of https://github.com/KhalidRich/NSBEHairSOS into yelp