Added bootstrap
Integrate with master
Boton Reset
Merge pull request #2 from scissorhands/bootstrap

Bootstrap