nothing change
Merge branch 'master' of https://github.com/hydrodog/LiquiZ2.git
Merge branch 'master' of https://github.com/hydrodog/LiquiZ2.git
classpath is now ignored
Conflicts:
	LiquiZ2/.classpath
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	LiquiZ2/.classpath
Merge branch 'master' of https://github.com/hydrodog/LiquiZ2.git
Merge branch 'master' of https://github.com/hydrodog/LiquiZ2.git
added image video audio and essay attributes