changes
Changes
Changes
diff
Fixed fucking  merge hell. NOW, FUCKING MERGE EVERYTIME YOU WORK ON YOUR CRAP CODE JESUS FUCK.