Projekt update
Fix
XMerge branch 'master' of https://github.com/DHLeipzig-CurrentTopics-SS2014/marlux

Conflicts:
	tut/.ipynb_checkpoints/A Short Intro to 'lxml'-checkpoint.ipynb