Merge branch 'production' of https://github.com/MovieBuddy/moviebuddy into production

Conflicts:
	app/styles/main.css
Pulling from team's work in prep for CSS merge.
Merge branch 'production' of https://github.com/MovieBuddy/moviebuddy into production

Conflicts:
	app/styles/main.css
Popcorn/butter-color for movie-filter buttons.
Padding bottom of 'outings' list for 'new outing' button placement.
Basic styling for 'profile' view.
Moderate styling & behavior for profile view.
Consistent styling between views.
CSS, outings view, & profile view update w/o error.
Bug corrected.
Merge branch 'bugfix' into redesign4

Conflicts:
	app/views/movies.html
Starting behavior for listings.
Prep for merge.
Merge pull request #14 from janaspage/production

Redesign Update #4