changed candyland to angular
Merge remote-tracking branch 'origin/candy-ng' into candy-ng

Conflicts:
	candyland.html
	js/candyland.js