Added persistence card with pushstate
minor adjusts
Merge branch 'master' of bitbucket.org:xiamx/comp307
merging