Merge branch 'master' of https://github.com/jordanabram1997/Bootstrap-Catt-Design

Conflicts:
	required.php
Merge branch 'master' of https://github.com/jordanabram1997/Bootstrap-Catt-Design