removing .DS_STORE
removing .DS_STORE... again
fixing requirements file
Merge branch 'master' of github.com:NathanielWroblewski/OmNom
woo
merging conflicts