Merge pull request #15 from Planxty-Dan/master

Fixed placeholder text to disappear
adds space when inserting word
Cursor moves to end of the message after inserting word
Merge pull request #16 from knnyluk/master

fixed spacing for inserting word and cursor position after insert
Adding filter for no words returning
Merging with new word backup
I did all this stuff
Merge branch 'master' into messagebug
Merge pull request #17 from KateCatlin/master

Adding backup array of words in case word does not generate
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'
changed api call and word select to use random word call instread of searching based on random word from array
Merge branch 'master' of github.com:BunniesAreCute/TextMadness

Conflicts:
	app/src/main/java/com/bunniesarecute/admin/textmadness/DictionaryAPI.java
	app/src/main/java/com/bunniesarecute/admin/textmadness/WordSelectFragment.java