Updates
More stuff
Merge branch 'paul'

Conflicts:
	controller.cpp
	controller.h
	wrapper.hpp
Merge branch 'master' of https://github.com/pdrews/TORCSDriver

Conflicts:
	racerx.cpp
	wrapper.cpp
	wrapper.hpp
Merge branch 'master' of https://github.com/pdrews/TORCSDriver

Conflicts:
	wrap.cpp