DS Store
Merge branch 'master' of https://github.com/landrywj/atlaswarner

Merging from the laptop version to the iMac version