Merge pull request #3 from adb421/master

Fixed the merge between the two versions, Jons changes and Adams changes.
Updated image_files.txt
Merge branch 'master' of https://github.com/NxR-Baxter/nxr_baxter_demo_package
Adam modified the position_user function to make the tolerances looser.
Forgot colons.