Merge pull request #10 from schietto096/firstVSBranch

whyyyyyy
Merge pull request #2 from schietto096/AndrewBranch

Andrew branch
Merge pull request #11 from fishinablender/firstVSBranch

merge across forks?