as
Merge branch 'master' of https://github.com/mullahaljaid/seminar_ss_14

Conflicts:
	Latex/Paper.aux
	Latex/Paper.log
	Latex/Paper.out
	Latex/Paper.pdf
	Latex/Paper.synctex.gz