First commit
Merge branch 'Skydreamer-master'
Merge branch 'master' of https://github.com/vnaydionov/schedule-mami