Added buses.
Merge branch 'master' of https://github.com/eordano/itba-ss-2014a

Conflicts:
	control.py
	test.py