forgot places
Merge branch 'master' of github.com:ttfnrob/wd3
Merge branch 'master' of github.com:ttfnrob/wd3
dates as lines
Merge branch 'master' of github.com:ttfnrob/wd3

Conflicts:
	app/views/pages/show.html.erb
Fix date opacity