ignoring apple cruft
new challenge!
Merge branch 'master' of github.com:foraker/refactoring