Added more stuff
updated robot builder file
Merge branch 'master' into HEAD
Removed some useless files