Implement reseting / continuing
Merge branch 'master' of github.com:taylorkelly/Tribes