initial commit
Merge branch 'master' of github.com:JadeIK/ikislenko

Conflicts:
	application/config/database.php