Merge branch 'master' of https://github.com/dopefishh/tt2015
authormart & charlie <tt1516@ru.nl>
Sat, 19 Dec 2015 12:42:05 +0000 (07:42 -0500)
committermart & charlie <tt1516@ru.nl>
Sat, 19 Dec 2015 12:42:05 +0000 (07:42 -0500)

Trivial merge