Assignment_1 v.1
Merge branch 'master' of https://github.com/Dim-Sal/short