Cleaned up app
Fixed readme conflict