ken's stuff
added train stuff
added kens stuff
moar stuff
poop
osx fixes
Merge remote-tracking branch 'origin/louise' into kensstuff

Conflicts:
	MainApplication.cpp
	MainApplication.h
	caltrain_runner.pro
working version of trains
added models and views
added north and south views
typo