not sure where I left off
Merge branch 'master' of https://github.com/knitterb/giftregistrylite

Conflicts:
	giftregistrylite/war/WEB-INF/familymemberendpoint-v1.api