commit before pull
Merge branch 'master' of https://github.com/atotalpirate/calligraffiti_showcase

Getting the project up to date with today's changes from work computer
sexier this way