Merge branch 'develop'
everything for assignment02 part 2
Merge branch 'master' into develop
Remove the sublime project files