update
update
Merge branch 'master' of github.com:darkobodnaruk/passreminder

Conflicts:
	reminder/templates/testpass.html