Pushed the uml, flow chart, and an alpha version of the .pptx
Merge branch 'sams-branch' of https://github.com/CS22CFall2014/Halt-and-catch-Pokemon into sams-branch
updating files I think? git forcing me to commit
attempting to merge justin with sam
deleting old .pptx