added basic tweening
Merge remote-tracking branch 'origin/tweens-and-dragons' into tweens-and-dragons

Conflicts:
	js/main.js