Fixed minor bug in smoothjoystick.cpp; it compiles now
Merge pull request #44 from ChampD/master

Fixed minor bug in smoothjoystick.cpp; it compiles now
Fixed joystick initialization in Shooter
Merge branch 'master' of github.com:Chantilly612Code/612-2014
Merge branch 'master' of github.com:Chantilly612Code/612-2014
more fixes
Merge branch 'master' of github.com:Chantilly612Code/612-2014
Merge branch 'master' of https://github.com/ethanhuey/612-2014

Conflicts:
	Shooter.cpp
	Shooter.h
	main.cpp
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014

Conflicts:
	Shooter.cpp