joshfire/joshfire-framework — comment on commit ebbc1bb4f6394bf5a0605d22a5b15f7457556580
File:  line 0
By nicolsc:

Fix Merge #35