test file
deleted file
Merge branch 'master' of https://github.com/AstroJuniorResearcherMeetings/git_an_adventure
Fixed the difference conflict
added boat_on_river_styx.html