init commit
latest
fully working
Merge branch 'master' into beta

Conflicts:
	.gitignore