gitignore
removed cached db files
Merge branch 'master' of https://github.com/qweikeris/mvc

Conflicts:
	application/database/config.live.php
	application/database/config.php