database fixe
Merge branch 'master' of https://github.com/justinjim/CSC309A2

Conflicts:
	application/config/database.php
Merge branch 'master' of https://github.com/justinjim/CSC309A2
Merge branch 'master' of https://github.com/justinjim/CSC309A2
Started on the admin page, just shows tickets so far
added new view