Initial Pull
No Changes... just getting up to date

Merge remote-tracking branch 'origin/master'

Conflicts:
	simple_client_2014/Debug/CL.read.1.tlog
	simple_client_2014/Debug/CL.write.1.tlog
	simple_client_2014/Debug/PumaClient.lastbuildstate
	simple_client_2014/Debug/PumaClient.log
	simple_client_2014/Debug/PumaClient.obj
	simple_client_2014/Debug/RobotCom.obj
	simple_client_2014/Debug/cl.command.1.tlog
	simple_client_2014/Debug/unitMsg.obj
	simple_client_2014/Debug/vc100.idb
	simple_client_2014/Debug/vc100.pdb
	simple_client_2014/PumaClient.sdf
	simple_client_2014/PumaClient.suo
	simple_client_2014/ipch/pumaclient-55675ed6/pumaclient-f411451e.ipch
	simple_client_2014/ipch/pumaclient-885ddb7a/pumaclient-f411451e.ipch
	simple_client_2014/ipch/pumaclient-b84558a7/pumaclient-f411451e.ipch
Fixed file tracking
modified .gitignore
Updated .gitignore and added magnet controller interface
moved tetromino.py, tetrisc.mid
Merge branch 'master' of https://github.com/sgibbs409/tetrisbot