New feature added
Feature text changed
Readme changed on feature
Stuff added
Readme fucked up
Fixed a conflict
one conflict at a time
happy times