Project changes merged.
Some work done.
merge
merge
Merge branch 'master' into bachelor
Some testing