Merge
Merge branch 'master' of https://github.com/skalde54/Erasmus-online-collaboration-website
Merge branch 'master' of https://github.com/skalde54/Erasmus-online-collaboration-website
Pull on server
Merge branch 'master' of https://github.com/skalde54/Erasmus-online-collaboration-website