Preparing to launch on public domain
Merge branch 'master' of github.com:blakeeb/ghost-fire
more style fixes
Merge branch 'master' of github.com:blakeeb/ghost-fire

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