Added BitmapFont to assets
Update gitignore.
Merge of merge merge margarin