can't remeber
Merge branch 'master' of https://github.com/jammers-ach/django-bootstrap-form

Conflicts:
	static/bootstrap_form/css/forms.css
Merge branch 'master' of https://github.com/jammers-ach/django-bootstrap-form