naming
Merge branch 'master' of https://github.com/greeness/letterpress_board
merge conflict