new stuff
Merge branch 'master' of http://github.com/mz21/dotink
layout merge

Merge branch 'master' of http://github.com/mz21/dotink