added at_work brewfile
fix master
fix at_work
fix conflicts