testing conflicts
resolve conflict add back main
Merge branch 'master' of https://github.com/sanja7s/SET37s

Conflicts:
	SET3/__main__.py
A version which can find for a single user his moving patterns (i.e. in
onde day go from a place and come back).