Merge pull request #3 from joetravis/feature/UpdateAngularversion

Change Angular version to 1.2.10, fixing grunt-cli version
Merge pull request #4 from joetravis/fixDefaultTesting

Fix default testing
Merge pull request #5 from joetravis/bowerConfigs

Move bower to app/lib
Initial commit for the maps
Added deploy task for grunt
fixing test
Merge pull request #6 from TAOAppin59/addRestaurantFinder

Add restaurant finder
Merge branch 'master' of github.com:joetravis/angular-grunt-karma-coverage-seed into protocol

Conflicts:
	app/index.html