Merge branch 'master' of https://github.com/ditma1/japreview

Conflicts:
	lib/views/index.jade