Bootstrap
Merge pull request #67 from micherreri/master

Project 1 and Bootstrap