FIXED BUG
Merge branch 'ver2' again
FIXED minor bugs

Conflicts:
	bus.html
	js/script.js