Test row added
Merge branch 'master' of git@github.com:glastopf/spamcan.git

Conflicts:
	templates/index.html