FIXED EVERYTHING
changes
fixed merge conflicts
Merge branch 'rarice4-master'