Initial commit
Merge branch 'master' of https://github.com/seawatts/media-troll
Merge branch 'master' into develop

Conflicts:
	.gitignore