Merge branch 'master' of /Users/ivanovkir/Downloads/tibalt/Dropbox/projects/guestbook/tinyGB with conflicts.
debugging removed