Initial commit
Improve the README
Merge from GitHub
messing with merges
Merge from remote