Initial commit
Merge branch 'master' of https://github.com/volgadar/asd-newframe