merged in authentication branch
resolved merge conflicts
Merge branch 'master' of https://github.com/cpkenn09y/Booty-Tracker into google_maps

Conflicts:
	db/seeds.rb
Merge pull request #4 from cpkenn09y/google_maps

Google maps