Thesis-update

DONE
- edited Conception
- edited Introduction

TODO
- finish Conception
- finish Introduction
- everything else