settings.py is changed
adding bootstrap.css
Merge branch 'integration_branch'