Merge branch 'master' of https://github.com/soycamo/gitx into soycamo-master
this merge is EXTREMELY necessary.  there's a little figgy cow!!
Merge branch 'soycamo-master'
I think all's well?
trying to ummm resolve a merge conflict
merge conflict resolution