Sam branch

This was inserted by Git because it couldn't merge automatically. You have to go in manually and remove this stuff (and then recommit) before committing and doing the pull request: currently this file has two body tags.