Added hint and feedback markers
Merge remote-tracking branch 'upstream/master'
Merge pull request #189 from adamarla/master

Hint marker to refresh hints