added reset
Merge branch 'master' of github.com:TechAtNYU/inwork
merged bootstrap