My changes
Merge branches 'Josh_Changes' and 'master'