removed event listeners in the destroy
Merge branch 'master' of https://github.com/jamesmichiemo/NJ_Squared
merge
merge conflict
fix stuff