making this responsive
change two css
Merge remote-tracking branch 'origin/master'

Conflicts: