Initial commit of Alpha 1
Merge commit 'c09bdbe7f6ee7659bafb9af5992d577710d621da'

Conflicts:
	.gitignore