Fixing bookmark stuff
Fixed some Log.e's
Merge branch 'master' into bookmarkshit

Conflicts:
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/controller/UserController.java
deleting log
Fixing bookmark timestamps
Removing log, for the last time.
Merge pull request #103 from edegraff/bookmarkshit

Bookmarks fix Closes #96