test
Merge branch 'master' of https://github.com/Q115/hackerrank

Conflicts:
	Candies.java