event show styling
Merge branch 'master' into sean
git ignore all pictures
cleaning up