Added a comment on the macbook. Not going to push it until we do another
Merge branch 'master' of https://github.com/pedersenjk/This-is-a-test

Conflicts:
	ThisIsOnlyATest/ViewController.h