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

Trivial merge