added line to macfile
Merge branch 'master' of https://github.com/meras/Demo

Conflicts:
	martin_mac.txt