changed tabs to two spaces
fixed readme merge conflict
Merge pull request #87 from mud-turtles-2014/whitespace

changed tabs to two spaces