Initial commit
Merge branch 'master' of https://github.com/faouzij/Team1
Fixing bugs