Git sucks.
Merge Conflict Fix.
Merge branch 'master' of https://github.com/rwiturralde/HubwayHackathon
Fixed Bean Error