style wikiful--version3  css written in application.css
Merge branch 'style_wikiful'

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