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

Trivial merge