Combining scripts

The Code made by Illy has been combined with the code from Roger.
combining scripts

combining scripts
merging
Merge branch 'master' of https://github.com/rogerww/Sky

Conflicts:
	SkyPet/scripts/Draw.js
	SkyPet/scripts/TestStuff.js
	SkyPet/scripts/initSceneObjects.js
merging

asd
new
Merge finally super merged

Wooop hurrayz!
Merge remote-tracking branch 'origin/master' into illfated