Reformatting layout before UI changes
Merge branch 'master' of github.com:FreeUKGen/MyopicVicar

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