merge conflict
Merge pull request #23 from andrewcallahan/hackathon-show

hackathon show page v1