jamie branch updating with jamieUpdate.txt
Merge branch 'jamieDev'