second commit
modx with first template vcard
Merge remote-tracking branch 'origin/master'