small changes
Merge branch 'master' of https://github.com/huyettcp/project_2_crossword
bad style
i hate things
confict resolution mcd's