Change
Merge branch 'master' of https://github.com/anidev/612-2013
Merge branch 'master' of https://github.com/anidev/612-2013
Merge branch 'master' of https://github.com/anidev/612-2013

Conflicts:
	launcher.cpp
Whatever "worked" on saturday 2/16. With a loose definition of "work"
Merge branch 'master' of github.com:anidev/612-2013
Merge branch 'master' of github.com:anidev/612-2013
Test Code
Merge branch 'master' of https://github.com/anidev/612-2013
Merge branch 'master' of github.com:anidev/612-2013
Changes
Merge pull request #80 from JeffTolbert/master

Some Changes And Tasks
Merge branch 'master' of github.com:anidev/612-2013

Conflicts:
	612.h
	joysmooth.cpp
added feeder counter