refactoring for new userrequests
Merge branch 'master' of https://github.com/rwiturralde/HubwayHackathon

Conflicts:
	src/com/gala/ui/CommandLineUI.java