Initial commit
initial commit
changes
Merge branch 'master' of https://github.com/KevinMarete/webadt
Conflicts:
	.project
	application/config/autoload.php
	application/config/database.php
	application/libraries/Doctrine.php