Moved stuff for demo
Merge branch 'master' of https://github.com/jump4r/Asylum
Beta presentation, stuff's a mess olawdy