created 1st carousel image, fixed ideal chart new
redirects to new activities form after ideal chart has been created
activities new work
Merge branch 'carousel'
carousel sliding
devise views styled
turbolinks taken out, example image working ok
carousel done
added buttons to only add an image or activity, but not both
carousel on center of page
added colors to charts
site page set
made button be inline
Eli's work on Devise views
Merge pull request #51 from missherico/EliDawson-devise_style

Eli dawson devise style
Merge pull request #50 from smspezzano/add_image_submit

Add image submit
carousel, and some dashboard
Merge pull request #52 from missherico/carou2

Carousel & dashboard work
fixec conflict in _form.html.erb in users
Merge pull request #55 from smspezzano/Sylvie_profile_update

Sylvie profile update