update
Merge branch 'pr/118'

Conflicts:
	views/index.ejs