added puzzler12
modified puzzler11
Merge branch 'feature2' into develop