modified:   tampomat/src/application/app.c
	modified:   tampomat/src/application/model.h
Merge branch 'master' of https://github.com/bloodscalp/erts-project