more button changes
Merge branch 'master' of https://github.com/christineoen/WorkoutBuddies

Conflicts:
	views/home.erb
	views/index.erb