FIXED EVERYTHING
changes
fixed merge conflicts
Merge branch 'rarice4-master'
Merge pull request #10 from crotten/master

Fixed merge conflicts