transfering v1.0
Merge branch 'master' of https://github.com/jstriedinger/jstriedinger.github.io
transfering v1.0