Changes in the trouble branch
Changes to the master branch
Completed merge of trouble, fixing conflicts along the way
Misc. Change
New file added