Merge remote-tracking branch 'origin/danny' into Hehfay
Changed danny.txt
fixed merge (I think)