edits
Merge branch 'master' of https://github.com/mattgabriel/Hackfest2013