Merge branch 'master' of https://github.com/dopefishh/tt2015
authormart & charlie <tt1516@ru.nl>
Sun, 20 Dec 2015 20:18:46 +0000 (15:18 -0500)
committermart & charlie <tt1516@ru.nl>
Sun, 20 Dec 2015 20:18:46 +0000 (15:18 -0500)

Trivial merge