Merge branch 'master' of github.com:Meleeri/leetcode

* 'master' of github.com:Meleeri/leetcode:

Conflicts:
	Candy/main.cpp
Merge branch 'master' of github.com:Meleeri/leetcode

* 'master' of github.com:Meleeri/leetcode:

Conflicts:
	Candy/main.cpp