Merge branch 'master' of github.com:joninvski/even_better_password_maker

Conflicts:
	.travis.yml