Merge branch 'master' of https://github.com/PenchoPenchev/Team_JaneAusten.git