reset button added
yay!
Merge branch 'master' into reset_button
something
asd
Merge branch 'alex_andrew' into reset_button
cool
fix mergo conflict
Merge pull request #12 from sayshay/reset_button

Reset button