added editting(wdith, height, color, rotation)
Merge branch 'master' of https://github.com/cman131/Dragon-Drop-Prototype

Conflicts:
	index.html
	js/site.js