fixes
Merge branch 'master' of github.com:sk91/GDG-Hafia