added hints for solutions in code, new ignore file
Merge remote-tracking branch 'upstream/master'
conflict solved