Merge branch 'master' of github.com:SolidCreek/yokel
adding updated readme
Merge pull request #45 from gabdallah222/master

Added async fixes for home controller and added proper routing for business and location
Merge branch 'master' of github.com:SolidCreek/yokel
bus fix
Added /api/search minor other changes
Merge pull request #47 from gabdallah222/master

redirect added  for FB auth, placesId updated to reflect google API
Merge pull request #46 from Zithrill/working

Added /api/search and other minor changes
Fixed client side facebook stuff
Merge pull request #48 from Zithrill/working

Fixed client side facebook stuff
Added more functionality to business/home controllers and page