work on the persistence
work on the persistence
Merge branch 'development' of https://github.com/jessejohnson/flippy into development

Layout changes by Jesse