wow many ports very drivetrain constructor wow
Merge branch 'master' of http://github.com/anidev/612-2014-advanced

Conflicts:
	Arm.cpp
	main.cpp
Merge pull request #31 from ZackAlfakir/master

wow many ports very drivetrain constructor wow
fixed merge errors