merge code with ives
Merge branch 'master' of github.com:jaydenlin/brandAve
merge code with ives