Switched Code Base Over
Merge branch 'master' of https://github.com/AmineMhedhbi/Ohm-Resistors

Conflicts:
	.gitignore
	api/application/cache/db_backup/sql.txt
	api/application/core/MY_Controller.php