added non js clock option
Merge branch 'clock'

Conflicts:
	app/views/layouts/_non_js_clock.html.erb
added first cucumber feature, incomplete