Fixed syntax errors
Merge branch 'master' of https://github.com/sdrendall/conditioningCage

Fixed syntax errors on two machines