renamed assets
Merge branch 'master' of https://github.com/nicam/threejs-macbook

Conflicts:
	MacBookConfigurator.js
Merge branch 'master' of https://github.com/nicam/threejs-macbook
- stuff to commit
 däää hammer