mike editing settings.java
Merge branch 'master' of https://github.com/michaelcop/CardsAgainstHumanity