Filling in Layout
Solved Merge Conflict

Merge branch 'master' of github.com:sebashwa/studentsonrails-musikinfo

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