Added a container for activty show page
Adjusted the front page margins as well
deleted:    app/assets/images/Fly_Boarding-0.jpg
new file:   app/assets/images/Fly_Boarding-2.jpg
modified:   app/assets/stylesheets/list.scss
modified:   app/assets/stylesheets/nav.scss
modified:   app/assets/stylesheets/variables.scss
modified:   app/views/activities/show.html.erb
Merge branch 'master' of https://github.com/thomasstephane/SYNthesis

Conflicts:
	app/views/activities/show.html.erb