Revert "Revert "Merge branch 'master' of https://github.com/leonson/practicum""

This reverts commit d7609bfde000c3b5f12837b461b68d7e2b1f36d4.

Conflicts:
	customer/a/Util.h
	customer/a/Util.m