Html
Merge branch 'master' of https://github.com/bittypass/version1

Conflicts:
	index.php