Add IPad media query
Add viewport settings, media query for iPhone landscape mode
media query for iPhone portrait mode
Merge branch 'master' into responsive-design

Conflicts:
	portfolio/static/css/style.css
	portfolio/templates/base.html
	portfolio/templates/contact.html
Merge pull request #1 from agrant12/responsive-design

Add IPad media query