version 1 bootstrap
version 1 bootstrap
Merge remote-tracking branch 'origin/master'

Conflicts:
	MainAPP/models.py
	MainAPP/urls/adminUrls.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	MainAPP/views/adminViews.py