iml
Merge branch 'master' of https://github.com/svachmic/WearTracks

Conflicts:
	.idea/misc.xml
	.idea/workspace.xml