update on project
Merge pull request #1 from CallmeSurge/master

merging my partners work with mine