Merge pull request #1 from rmarinac89/master

added media queries
Merge pull request #2 from rmarinac89/gh-pages

Merge pull request #1 from rmarinac89/master