maybe added Directions, if it worked
Merge remote-tracking branch 'upstream/master'
Did things
Merge remote-tracking branch 'upstream/master'