COmmit test
Testing Conflict1
Testing2
Testing1and2
Testing3
Testing 4
Commit
commit1
commit1
Commit
commit
commit 2
commit3
Merge branch 'master' of https://github.com/gavarasana/edboard.git

Conflicts:
	com.acc.tools.ed/com.acc.tools.ed.web/src/main/java/com/acc/tools/ed/web/editor/TestClass.java