Merge branch 'release-0.0' into development
Updated model, schema, controller and views to allow upload of profile pic. Need to set up AWS
Added Teams controller, model and migrated DB for teams.
Updated controller with Show action, created view and added basic layout. Added migration for new profile fields
Updated CSS
AWS S3 config set up
cool
Merge branch 'user-profiles' into development
Merge branch 'master' of heroku.com:murmuring-falls-9469 into release-0.1
Fixed production.rb
Added fields to profile update form and strong_params
Team index, show, and update all working. views need work, need to update development to pull in paperclip gem
Merge branch 'release-0.1' into development
Updating schema.rb
merging in User story to include paperclip gem. Hope I didn't fuck up the schema
Added profile pic fields to Teams
Merge branch 'team-creation' into development
Merge branch 'development' into release-0.1
Getting profile pic working
Merge branch 'release-0.1' into development