cleaning commit

Syncing files from Yu Yin's computer so I can pull
Merge branch 'master' of https://github.com/mrjax/Team-Wireless-Sensor-Network

Conflicts:
	MultiWiiConf/application.windows32/SerialPort.txt