Init
Merge branch 'master' of https://github.com/mrstocks/secret-minja

Conflicts:
	.gitignore