Bootstrap project
Merge branch 'master' of https://github.com/asusoda/Assassins

Conflicts:
	.gitignore