Finalize last night's changes

jussss making sure
Merge branch 'development' of https://github.com/Knowharassment/KnowHarassmentLive into development

Conflicts:
	css/bootstrap.css