Merge branch 'development' of https://github.com/edokun/katana_project into development
added stylesheet for bootstrap and fixed some issues with the routes