Merge pull request #2 from martinaLopez/master

Added state saving and updated Json files.
Fixed error with timeout.
Merge pull request #3 from martinaLopez/master

Now the game loads X number of words before it starts.
Merge remote-tracking branch 'origin/master'
Added PreferencesActivity.
Translated to Spanish.
Added new main activity with two buttons(start new game, continue game). Only start new game has an onClickListener