Merge branch 'master' of https://github.com/dopefishh/tt2015
authorpimjager <pim@pimjager.nl>
Wed, 20 Jan 2016 12:15:43 +0000 (13:15 +0100)
committerpimjager <pim@pimjager.nl>
Wed, 20 Jan 2016 12:15:43 +0000 (13:15 +0100)

Trivial merge