figuring out merge conflicts
Merge branch 'master' of github.com:jasonou/lettergram