Scaffolding improved
Threejs and angular INTEGRATED
Merge branch 'master' of https://github.com/krgeppert/ericrius

Conflicts:
	app/index.html
	app/scripts/app.coffee
	app/scripts/app.js