update for pull
Conflicts:
	WeDo/LogFile.txt
	WeDo/src/userInterface/UserIntSwing.java