Best of summer term 2014 or 'GIT :/'
Merge pull request #76 from thrau/master

Best of summer term 2014 or 'GIT :/'