gitigonre added, iml and idea deleted
gitignore added. idea and iml deleted
ignore files
refactrog
Merge remote-tracking branch 'origin/Anton'

Conflicts:
	.idea/compiler.xml
	.idea/copyright/profiles_settings.xml
	.idea/encodings.xml
	.idea/misc.xml
	.idea/workspace.xml
	PhotoShareTest.iml
	src/main/java/core/pages/Header.java
	src/main/java/core/pages/LoginPage.java
	src/main/resources/locators.properties
Merged stuff
Merge branch 'master' into Anton

Conflicts:
	PhotoShareTest.iml
	src/main/java/core/pages/Header.java
	src/main/java/core/pages/LoginPage.java
	src/main/resources/locators.properties