Test conflict
Merge branch 'master' of https://github.com/hawksprite/Tramline

Conflicts:
	tools/parser.rb