Initial changes
Merge branch 'master' of https://github.com/Watson-Reboot-Project/Assembly-Lab

Conflicts:
	js/assemblyui.js