I did all this stuff
Merge branch 'master' into messagebug
Merge branch 'messagebug' of github.com:Bfinity/TextMadness into Bfinity-messagebug

Conflicts:
	app/src/main/java/com/bunniesarecute/admin/textmadness/DictionaryAPI.java
	app/src/main/java/com/bunniesarecute/admin/textmadness/WordSelectFragment.java
Merge branch 'Bfinity-messagebug'
Merge pull request #19 from knnyluk/master

fixed merge conflict for branch 'Bfinity-messagebug'