Merge branch 'master' of https://github.com/dopefishh/tt2015
authorCharlie Gerhardus <charlie.gerhardus@somedomain.something>
Sun, 4 Oct 2015 15:56:35 +0000 (17:56 +0200)
committerCharlie Gerhardus <charlie.gerhardus@somedomain.something>
Sun, 4 Oct 2015 15:56:35 +0000 (17:56 +0200)
1  2 
2approach.tex

diff --cc 2approach.tex
Simple merge