Merge branch 'master' of https://github.com/dopefishh/tt2015
authorcharlie <charlie.gerhardus@student.ru.nl>
Tue, 26 Jan 2016 20:18:16 +0000 (21:18 +0100)
committercharlie <charlie.gerhardus@student.ru.nl>
Tue, 26 Jan 2016 20:18:16 +0000 (21:18 +0100)

Trivial merge