rjflp/ett-tourism — pull request #4 by joninvski (2013-06-20 23:24:07+00:00)
Title: Semantic correction on the rebased branch.

Please ignore the previous pull request as it is no longer valid

Part 3

(this is on the rebased branch)

Please check the TODO lines