Project setup
Merge branch 'master' of github.com:Stoyicker/LoLin1