First Stage of the project
Merge branch 'master' of https://github.com/manuelstephan/Project