initial commit
Merge chpl

Conflicts:
	.gitignore