work done
merge
Merge branch 'master' of github.com:kyleshike/fl_mag