added .idea to gitignore
erge branch 'master' of github.com:adnanh/qa

Conflicts:
	.gitignore