added rock climbing
added 1955
Merge branch 'master' of http://github.com/AstroJuniorResearcherMeetings/git_an_adventure
Merge branch 'master' of http://github.com/AstroJuniorResearcherMeetings/git_an_adventure
added footprints
fixed the conflict in nov 5 1955
Merge branch 'master' of http://github.com/AstroJuniorResearcherMeetings/git_an_adventure