initial commit
Merge branch 'master' of https://github.com/mtrupkin/flagship

Conflicts:
	.gitignore