test1
 Merge branch 'master' of https://github.com/lndwng/newslettercool

Conflicts:
	routes/index.js

merge?

 Please enter the commit message for your changes. Lines starting