Merge pull request #1 from spikeballer/master

Manny wuz here
Update
you're welcome
Merge pull request #2 from ProjectCS3305/master

you're welcome
Merge pull request #3 from ProjectCS3305/Manny's-Branch

Merge pull request #2 from ProjectCS3305/master
Merge pull request #1 from ProjectCS3305/master

I HOPE THIS WORKS