Don't merge, just look at the notes =)

Overall a job well done, the app runs, it has a few bugs but a great job for your first hackathon/app!