synchronizing
Merge branch 'master' of https://github.com/roypiyush/home-topcoder.git

Conflicts:
	src/main/java/com/dp/Stamp.java