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

Conflicts:
	shooter.cpp
*sigh* silly mistakes . . .
Merge branch 'master' of git://github.com/swarage/612-2013 into swaraj

Conflicts:
	shooter.cpp