playing around with fixing styling but not that successful
Merge branch 'master' into stef

Conflicts:
	app/views/cheerups/index.html.haml
fixes the nav bar so all the elements are not stacking on top of each other
converts display methods link to radio buttons and displays cheerups as tiles though needs more work
Merge branch 'master' into stef

Conflicts:
	app/assets/javascripts/cheerup.js
	app/assets/stylesheets/style.css.scss
	app/views/cheerups/index.html.haml
	app/views/layouts/application.html.haml
adds about cheerups modal link to nav bar, adds style to notice and alert messages, adds a fixed nav bar
improves flash message styling and formatting and fixes nav bar links padding
Merge branch 'master' of github.com:stefanielim/Cheerups_Project_2

Conflicts:
	app/assets/javascripts/cheerup.js