Update .gitignore to ignore DS_Store (duh)
Merge branch 'master' of https://github.com/RyanMG/PathfinderCards
Style framework