Merge pull request #55 from kathleen-a/master

Iteration 2 of design fair poster
Merge pull request #56 from kathleen-a/master

Updated ppt so that fonts are embedded
Merge pull request #57 from kathleen-a/master

Added prototype picture
Added movie outline

It's really just a rough draft so if you have other ideas feel free to
change it
Merge pull request #14 from ThatGeoGuy/master

Update local repo