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