Prevent unnessesary files from being committed by Mac users
Merge branch 'master' into feature_TBDoWhile