Minor changes added
Merge branch 'master' of https://github.com/SolidCreek/yokel

Conflicts:
	client/app/home/home.controller.js
	client/app/home/home.html
	client/app/user/user.controller.js
testing facebook auth
auth routs working but database/promise issues
Working on Auth stuff
Added map functionailty and connectivity between model and view
Merge pull request #32 from gabdallah222/master

Added map and view data binding
add models for places and reviews
Merge branch 'master' of https://github.com/SolidCreek/yokel
Merge branch 'master' of github.com:SolidCreek/yokel into cloud
cleaning up commit
Conflicts:
	client/app/home/home.html
Merge pull request #33 from stefceror/master

adds models for places and reviews
Merge branch 'master' of github.com:SolidCreek/yokel into cloud
merge
fixed deleted html
Code Cleanup