ref #40 adding time in progress
merged
adding moment.js
Merge branch 'header'

Conflicts:
	public/sass/screen.scss
	public/stylesheets/screen.css
merged conlicts
Merge branch 'master' of https://github.com/tomohiro-n/tofu

Conflicts:
	public/sass/screen.scss
	public/stylesheets/screen.css