welcome page
welcome page and char.keys
Merge remote-tracking branch 'origin/master'