pulling Alan's hint button
merge conflict fixed for hint button
hint system mostly done by Angel and Alan, with a small UI bug