Manual update of the bbxm tramCode from another computer.
Merge branch 'master' of https://github.com/sdp14/tramCode

Conflicts:
	stateMachine/.gitignore
	stateMachine/.gitignore~
Untracking unnecessary files from tramCode