validate info fixed
ss
Merge https://github.com/markp544/airuoft_project

Conflicts:
	application/config/routes.php