don't remember what changed if anything
fixed conflicts
added the get -color method and the get_rank method