added random name for watermark on name entyr screen
Merge branch 'master' of https://github.com/holsee/card-man

Conflicts:
	routes/index.js