Add smarty
Merge remote-tracking branch 'origin/master'
Marge branches, yo