MAC File changed
Merge branch 'master' of http://github.com/henrybond158/Smart-Programming-Project

Conflicts:
	macFile