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
added bunny assets
Merge pull request #20 from Planxty-Dan/master

Changed api to use random word and changed methods to use just the one word received form API
added lib
continue frag
commented out the DictionAPI code to select only the words based on the wordType
Merge branch 'master' of github.com:BunniesAreCute/TextMadness

Conflicts:
	app/src/main/java/com/bunniesarecute/admin/textmadness/WordSelectFragment.java
spacing fixed in word select
Merge pull request #21 from Planxty-Dan/master

commented out the DictionAPI code to select only the words based on the ...
Merge branch 'master' of github.com:BunniesAreCute/TextMadness
fixed text message function by coming continue or not function
commented out textbuilder calls as they are not needed until we mask the words to send.
animation working