Add bootstrap to home page
Pretty Rspec, add routes to links, generate Users controller
Add new user page and route. Finish ch. 5
fix merge conflicts