Add idea to gitignore
group1-3 Add composer
Merge remote-tracking branch 'origin/master' into group1-3

Conflicts:
	.gitignore
Merge pull request #7 from HelloWorld-PHPJunior/group1-3

Add composer