Resolved conflict
Merge branch 'master' of https://github.com/denysboiko/cover-me

Conflicts:
	views/index.ejs