did I do this right?
Merge branch 'master' of https://github.com/C4MT4YL0R/CSMM703

Conflicts:
	README.md
Merge pull request #16 from ecricci/master

Flickering Stars