add .gitignore, move BMGlyphFont to separate dir
add cocoapod
merge conflict
merge conflict resolution
conflict