Merge branch 'master' of github.com:Baconthorpe/Greatist_iOS_App_Ever
Merge branch 'master' of github.com:Baconthorpe/Greatist_iOS_App_Ever
Merge branch 'master' into alternateUniverse
another tweak to gitignore