Test the foursquare2 gem
Implement user model with name and email attributes
Add a secure password field to our user model
Merge branch 'feature-users' into develop
Merge branch 'feature-foursquare-api' into develop

Conflicts:
	Gemfile