first commit
Merge branch 'master' of https://github.com/jaschvimer/ThePlug

Conflicts:
	.gitignore
first commit
Merge branch 'master' of https://github.com/jaschvimer/ThePlug

Conflicts:
	.gitignore