Initial commit
Added initial files
Merge origin/master

Conflicts:
	Docker
	run.sh