No more DS_Store, wish Git would automatically ignore it
Merge branch 'master' of https://github.com/ryanmcdermott/Frameworkr