new ignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/totalbeginner/MyLibrary.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
add all saved files and removed global ignore .idea/