argh
Merge https://github.com/maniart/thesis2013website

not entirely sure what happened..
m