first commit
Merge branch 'master' of github.com:guanlitouch/flex_homework_1