deleted unused modified layout to use main_app
Merge branch 'forums' of https://github.com/elizabrock/coursewareofthefuture into forums

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