commiting
changes
merging
Merge branch 'master' of https://github.com/h2r/affordances
rebuild after merge