stuff
Merge branch 'viewer' of github.com:MarcSpitz/ldebroux_kjadin_masters-thesis_2014 into viewer