@stephenitis @cpkenn09y : welcome page
User Model created, seed file for import
rake db:seed imports user data from socrates
added example .env
added gitignore
Merge pull request #1 from cpkenn09y/google_maps

Google maps
Merge branch 'master' of https://github.com/cpkenn09y/Booty-Tracker into authentication

Conflicts:
	config/routes.rb
Merge pull request #2 from cpkenn09y/authentication

Great pull request Ken!
users belong to cohorts, seed script updated
merged in authentication branch
Merge pull request #3 from cpkenn09y/authentication

users belong to cohorts, seed script updated
resolved merge conflicts
Merge branch 'master' of https://github.com/cpkenn09y/Booty-Tracker into google_maps

Conflicts:
	db/seeds.rb