added README and cleaned up some of the code
fix merges
ok