no message
Merge branch 'sample'

Conflicts:
	src/main/java/com/appskimo/dev/test/HashSample.java