Added bootstrap to project, added routes and worked on basic layout
Fix merge conflicts
Merge branch 'filling-in-layout'