more editing work
Merge branch 'master' of github:FotoVerite/nametagday