cleanup
Merge branch 'master' of https://github.com/brianfitzgerald/angora

Conflicts:
	agThree.js