Added bootstrap functionality
Added bootstrap functionality
Merged conflicted routes