merged with the other project
because i have no idea what's going on lol
Merge branch 'master' of https://github.com/nrafter/ghost-2.0