Primer commit
Merge branch 'master' of https://github.com/banchoff/angkor

Conflicts:
	README.md