Merge remote-tracking branch 'origin/master'

Conflicts:
	BobAndFriends/BobAndFriends/bin/Debug/BobAndFriends.exe
	BobAndFriends/BobAndFriends/bin/Debug/BobAndFriends.pdb
	BobAndFriends/BobAndFriends/obj/Debug/BobAndFriends.exe
	BobAndFriends/BobAndFriends/obj/Debug/BobAndFriends.pdb