Commit Live PR#57

psicktrick wants to merge 7 commits intocommit-live-students:mastercommit-live-students/olympic_project_new:masterfrom

psicktrick:masterpsicktrick/olympic_project_new:masterCopy head branch name to clipboard