This is a test commit. This better work!
This is a test message! This better work!
Merge branch 'master' of https://github.com/tigy888/tigytech_erdB_alpha

Conflicts:
	HelloWorld/bin/HelloWorld.class

This is a test!