add styleguide
merge
commit
first headlines all h1 now
Merge branch 'master' into newstyle

Conflicts:
	app/views/layouts/application.html.erb
Merge pull request #17 from cherimarie/newstyle

Newstyle