map path
hello
Merge branch 'master' of https://github.com/AmandaSutherland/ERRbot into develop
okay
resolved
package.xml looks good
fixed ERRbotPath conflict