add some_file.txt
Merge branch 'atlas'
Merge branch 'master' of https://github.com/rock-doves-2014/stranger-zone