fix conflicts
fix conflicts

mokemokechicken/CrashMonkey,berendkleinhaneveld/CrashMonkey,mokemokechicken/CrashMonkey,RuudPuts/CrashMonkey,wirelesscollege/iosmonkey,wirelesscollege/iosmonkey,wirelesscollege/iosmonkey,RuudPuts/CrashMonkey,RuudPuts/CrashMonkey,mokemokechicken/CrashMonkey,berendkleinhaneveld/CrashMonkey,berendkleinhaneveld/CrashMonkey