final push from thesis installation
Merge branch 'master' of https://github.com/oherterich/spring2014-thesis

last push/pull from thesis show