Made some changes and got ready for routing.
Merge branch 'master' of github:erhlee-bird/trackmanga

Conflicts:
	smart.lock