Json working (gotta test now)
removed bin
simple ignore file (just bin)
simple ignore file (just bin) for reals
bin merge conflicts