initialization commit for qaframework
Merge branch 'master' of github.com:ivankarpey/qa
resloving conflicts in .gitignore

Conflicts:
	.gitignore