move editor
Merge branch 'master' of https://github.com/ccordle255/R2PG

Conflicts:
	SmashBots/js/main.js
	SmashBots/robot_frame.html