layout changes
Merge branch 'develop' of github.com:Xanadhi/time_capsule into develop

Conflicts:
	app/views/index.erb