Commiting before merge
Merge remote-tracking branch 'james/server' into serverthing
Merge pull request #86 from jviau/master

Thumbnail and WebStorage changes/fixes
Merge branch 'master' of https://github.com/CMPUT301F13T03/adventure.datetime into serverthing
Merge remote-tracking branch 'james/server_fix' into serverthing
Changed storymanager to accomodate new web storage
Deleted logs