Working copy
Merge branch 'master' of https://github.com/javto/bsc-project.git