keeps on popping up arrghh createjs i hate you
resolved merge conflicts