still just trying to make it work.
Merge branch 'master' of https://github.com/rebeccamurphy/Hackathon-2013

Hopefully this won't ruin everything.