Accordion, Layout, Index, And Style Updated
Merge branch 'user'

Conflicts:
	app/views/layout.erb
	public/css/application.css