saving activity_main
picture poll save
merge activity
Merge branch 'master' of github.com:army-of-dumbledore/pennappsF13
pull the stupid activity_main out of history