added loki
Merge branch 'master' of https://github.com/mariusc/mariusc.github.io