Merge branch 'master' into gh-pages
Media Query in css added for week 2 makeup points -- Instagram location integration with geolocation added for Mashup # 1
Merge branch 'gh-pages'