Merge branch 'master' of /Users/kruny1001/WebstormProjects/pbshop with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
9/15 Responsive Design