Merge pull request #31 from ZackAlfakir/master

wow many ports very drivetrain constructor wow
coding fallacies fixed
fixed driver issue
fixed merge errors
Merge pull request #32 from swarage/master

coding fallacies fixed
Merge branch 'master' of http://github.com/anidev/612-2014-advanced

Conflicts:
	main.cpp