Initial Commit
Merge branch 'master' of https://github.com/lonehangman/Soshified

Conflicts:
	.gitignore
Initial Commit