Styling
Merge branch 'master' of https://github.com/christineoen/WorkoutBuddies

Conflicts:
	views/index.erb
	views/layout.erb