Correctly renders views for executive and production board
Merge branch 'master' of https://github.com/aaronjosephs/BTV_project

Conflicts:
	Gemfile
	app/views/layouts/application.html.haml