* Saving work for pull/merge
Merge branch 'master' of https://github.com/bchavez/SharpFlame.git