Initial Commit
Continuing project setup
Merge branch 'develop' of github.com:paulollivier/blackbox
corrected project