Spring first pass.
Merge branch 'master' of https://github.com/rwiturralde/HubwayHackathon

Conflicts:
	src/com/gala/core/Main.java
Adding spring.