some small change
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'golden/develop' into develop
changed to String for Danny boy
Merge pull request #10 from neoemonk/develop

String change
Merge remote-tracking branch 'golden/develop' into develop
changing the case of the file to proper case
adding getters and setters for model objects.
undoing the silly stupid change
Merge branch 'code_review_model_update' of https://github.com/chenry/ChuckNorrisJokes into merge_pull_req_11
Merge branch 'merge_pull_req_11' into develop
Merge remote-tracking branch 'golden/develop' into develop