Fixed bug causing animations for selection to appear when clicking a disabled button.
Added screen_name, profile_picture, about_me to User model. Also added favorite_cuisine for use in map branch.
Using paperclip and Amazon web services gems for storing user photos. Added config vars to heroku and environments.
Created migration for adding avatar (profile picture) to user model. Added avatar config to user model.
Added registrations controller which extends Devise controller so extra fields can be specified in permitted params.
Exposing avatar file field in new and edit user views.
Added favicon to all pages.
Using gmaps4rails gem for displaying Google Map on homepage, requires underscore.js
Implementation of gmap using geolocation to center map and styled map from Snazzymaps.com.
Generated Favorites model for storing list of restaurants favorited by user.
Forgot underscore.js library.
Completely redone HTML and styling for template.
Redone homepage with new template and styling.
Merge branch 'map' into develop
Merge branch 'style' into develop.

Conflicts:
	app/views/main/index.html.erb