Committing Make and Model entity changes
Merge branch 'master' of https://github.com/AFenhoff/Greeter

Conflicts:
	Greeter/IdentificationViewController.m