initial commit
Merge https://github.com/stevenaubertin/IMN430