init commit
Merge branch 'master' of https://github.com/dam4256/MassiveTribble

Conflicts:
	.gitignore