Commiting the whole project. This is currenly very old and need to be modified
Merge remote-tracking branch 'origin/master'