modal
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/index.ejs
coverme
Merge branch 'master' of https://github.com/denysboiko/cover-me