Merge https://github.com/kristinahu/TrainBoard

Conflicts:
	TrainData.php
abbreviated names
Merge pull request #9 from klesse413/master

abbrev names