some file to ignore
Merge branch 'master' of https://github.com/ArtemMikhaylov/ExpActionBar

Conflicts:
	ExpFragmentsFolder/ExpFragments/.idea/workspace.xml