2
release 1
master 1
delete 1
delete 2
master 2
release 2
Merge branch 'delete'

Conflicts:
	Main.java
Merge branch 'release'

Conflicts:
	Main.java