Revert "Merge branch 'master' of https://github.com/SWTI2014/SWTI2014-Project-14 into message-handling"

This reverts commit 2876751e4ce480b82223069bfee07b2733e88c3e, reversing
changes made to 6a594dd947ab2891375c39436227784670b90fcf.
Revert "removed breakpoint"

This reverts commit 6a594dd947ab2891375c39436227784670b90fcf.