More commeits
Merge branch 'master' of https://github.com/danjamker/TransportAPI

Conflicts:
	TransportAPI.sublime-workspace
	makefile