improved gitignore
Merge branch 'master' of https://github.com/workwithfriends/workwithfriends
Merge branch 'master' of https://github.com/workwithfriends/workwithfriends