whitespace
Whitespace and warnings cleanup
Remove unused sketch
Update README
Merge Conflicts
More fixes after merge conflicts
Merge pull request #74 from karianna/master

Whitespace revert to non-windows carriage returns, formatting and Java 7 updates