Commit to resolve conflict for pulling
Merge branch 'master' of github.com:locle/MiniEvaluationApp

Conflicts:
	MiniEvaluationApp.xcodeproj/project.pbxproj