File upload
Merge branch 'master' of https://github.com/alankun/mystery

Conflicts:
	application/config/database.php
File Upload