Signed-off-by: Grinch <artem@zappylab.com>
Merge branch 'master' of https://github.com/zappylab/workout.git

Conflicts:
	.gitignore

Signed-off-by: Grinch <artem@zappylab.com>