Merge branch 'master' of git.njae.me.uk:cas-master-teacher-training
authorNeil Smith <neil.git@njae.me.uk>
Thu, 4 Dec 2014 23:20:30 +0000 (23:20 +0000)
committerNeil Smith <neil.git@njae.me.uk>
Thu, 4 Dec 2014 23:20:30 +0000 (23:20 +0000)
1  2 
algorithms.html

diff --cc algorithms.html
Simple merge