Trying to resolve merges
Merge branch 'master' of https://github.com/iproskurin/ExerciseTracker
resolving conflicts