first commit
Merge branch 'master' of https://github.com/is-a-cat/projectphoenix
setting up