init commit
Merge branch 'project_rebase' into merg
Merge pull request #1 from Classlocus/merg

Merge new base project into master