completed do in background task
parsing method complete
created interface and implemented in word select frag
json done, interface not working
it's workingtext on main screen
added array of dirty words and random generator, plus default word
Merge pull request #14 from Bfinity/asynctask

Asynctask
playing with API calls but deleted everything from DictioaryAPI to make merge easier
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
changed placehold text in the editText field of main to be a hint, so text will disappear on typing
Merge pull request #15 from Planxty-Dan/master

Fixed placeholder text to disappear