added media queries
Merge branch 'master' of https://github.com/novawebdevelopment/aea
Merge branch 'master' of https://github.com/novawebdevelopment/aea
Merge branch 'master' of https://github.com/novawebdevelopment/aea
got rid of conflict messages