atomics
Merge branch 'master' of github.com:leofigy/Cin2014