commit before bower integration
bower integrated
Merge branch 'master' of github.com:cuttlesoft/lurcat-flask

Conflicts:
	.gitignore
	lurcat/static/css/bootstrap-responsive.css
	lurcat/static/css/bootstrap-responsive.min.css
	lurcat/static/css/bootstrap.css
	lurcat/static/css/bootstrap.min.css
	lurcat/static/css/datepicker.css
	lurcat/static/js/vendor/bootstrap-alert.js
	lurcat/static/js/vendor/bootstrap-datepicker.js
	lurcat/static/js/vendor/bootstrap-dropdown.js
	lurcat/static/js/vendor/bootstrap.js
	lurcat/static/js/vendor/bootstrap.min.js
	lurcat/templates/layouts/base.html

fucking git
still fixing that fuck up