Changes in the trouble branch
Machin work
Completed merge of trouble, fixing conflicts along the way
Added a new file in machine 1
Merge branch 'master' of https://github.com/siofongwong/GITtest