inital setup, some work has already been done without commits
Merge remote-tracking branch 'origin/master'