added static data stuff
Merge branch 'master' of github.com:rkgibson2/hackfest-project