Update atlas
Merge branch 'master' of github.com:chrismcmath/shanghai
Atlas update