Init
Merge branch 'master' of github.com:casterx/casterx

Conflicts:
	.gitignore