Initial commit
Merge branch 'master' of github.com:Magmoz/galaxy

Conflicts:
	LICENSE