Added bootstrap and custom.css
Finish layout and routes
Fix merge conflict