Merge pull request #251 from moorej12/master

#245 Finished merging
Round one of unit tests
Unit Test For All
Now featuring deletions.
dkfjdkfj
More Unit Tests
Merge pull request #253 from moorej12/master

#249 editing and deleting picture tiles works. #198 Resolved all TODOs
Merge pull request #254 from moorej12/master

#252 Added changing story title. Also fixed a bug where if an author cac...
Put help back into main page dialog
Merge pull request #255 from klindenbach/master

Put help back into main page dialog
#236 Fixed no refresh after delete
Merge pull request #256 from klindenbach/master

#236 Fixed no refresh after delete
Resolved #250 Refresh doesn't work
Merge pull request #257 from klindenbach/master

Resolved #250 Refresh doesn't work
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project

Conflicts:
	ChooseYourAdventureTest/src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/test/DBHandlerTest.java
Last of the Unit Tests, hopefully
Here, have Unit Tests
Merge pull request #260 from KarlParkinson/master

Unit Tests Passing
Fixed Tests
Merge pull request #261 from jcadek/master

Fixed Tests