trying to see if merge is needed.
Merge branch 'master' of https://github.com/pnic/Bachelor.git