wikipedia summary
Merge branch 'master' of github.com:shimarin/shimarin.com