Fixed errors
Merge branch 'master' of github.com:Chantilly612Code/612-2014

Conflicts:
	main.cpp
Removed windriver files and added them to gitignore
Merge branch 'master' of github.com:Chantilly612Code/612-2014
Fixed the registries
Merge branch 'master' of github.com:Chantilly612Code/612-2014

Conflicts:
	SmoothJoystick.cpp
	SmoothJoystick.h
	main.cpp