:neckbeard: Added .gitattributes
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Added Church Leadership
fixed merge issues
Merge branch 'jcmolitoris-master'