initial commit
Merge branch 'master' of https://github.com/raptorSix/tutorial

Conflicts:
	.gitignore