Added name
Merge branch 'master' of https://github.com/NottHack/NottHack1