Assignment_3 removed
Merge branch 'develop'