reset partially working
Merge branch 'master' of github.com:Dr-Jerm/nmGameJam2013

resetting from server