updates
Merge branch 'master' of github.com:nikolajbaer/nikolajbaer.github.com
basic setup
updates