add gems and assets
Merge remote-tracking branch 'origin/master'
modify css
Merge remote-tracking branch 'origin/master'
sadsa