Practicing Git
Merge branch 'master' of https://github.com/iPain/CS310

Practicing Git Merge