v1.0
Merge branch 'master' of http://github.com/thinKnight/knickknacks