templates done -almost
Merge branch 'master' of https://github.com/ybv/whereis.it