made a change that should cause a conflict
made a change in same line as in feature1 branch
Merge branch 'feature1'

Conflicts:
	src/ee/ignite/MySuperClass.java
adde "bin" to ".gitignore"