added some test css
css for layout

attempt to fix merge problem
fixing merges

pls ignore
Merge branch 'master' of https://github.com/pigpigs/ideabakery

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

:x