Fixing total atomic null pointer problems.
Merge branch 'master' of https://github.com/shinhermit/Projet-SD-M1