add gitignore
add other
fix merge
Merge branch 'master' of https://github.com/flamencist/IkraTask

Conflicts:
	Config.php