Tripled the names table
Merge branch 'master' of github.com:Morrolan/surrealism

Why does this keep having a go at merges?