Initial Commit
Merge branch 'master' of https://github.com/Phas3Three/phas3three

Conflicts:
	.gitignore