fix user message
Merge branch 'master' of https://github.com/pietdaniel/JAMR into fix-user

Conflicts:
	templates/index.html
Merge pull request #6 from pietdaniel/fix-user

fix user message