handlebar done (no style yet)
Merge remote-tracking branch 'origin/master'
merged with changes