Finalizing layout
Merge branch 'master' of https://github.com/JohnBehnke/SwagTracker

Conflicts:
	app/views/companies/index.html.erb