local change - do not pull
Merge branch 'master' of https://github.com/nnesic/Fabulous.git
Fixed broken files.