onResume added
Merge branch 'master' of github.com:aleksandarAxeltra/GitTest into resume
added log in master
conflict in master resolved