Add Macbook
Fix merge conflict
Merge branch 'niven01-master'