no message
Merge branch 'master' into gh-pages

* master:
  tuned up file naming for syllabi

Conflicts:
	GEOG485-585_syllabus.pdf
	deep-dives/deep-dives.pdf
	goalsAndObjectives/goalsAndObjectives.pdf
	lectures/geog485_sp2014_01.pdf
	milestones/milestones.pdf
Merge branch 'master' into gh-pages

* master:
  tuned up file naming for syllabi

Conflicts:
	GEOG485-585_syllabus.pdf
	deep-dives/deep-dives.pdf
	goalsAndObjectives/goalsAndObjectives.pdf
	lectures/geog485_sp2014_01.pdf
	milestones/milestones.pdf
Merge branch 'gh-pages' of https://github.com/karlbenedict/GEOG485-585 into gh-pages

* 'gh-pages' of https://github.com/karlbenedict/GEOG485-585:
Cleanup
no message
no message
Initial Week 2 materials update
week 2 style and content updates
update to links in week 2 presentation
example filename change
no message
milestones update
update to goals and objectives
correction to week 2 slides
no message
Update with week 3 content
Added Google Maps Examples
Merge commit 'da0ae58510fa47ad025f8bf84bce122fa58a289b'

Conflicts:
	GEOG485-585_syllabus.pdf
	deep-dives/deep-dives.pdf
	goalsAndObjectives/goalsAndObjectives.pdf
	lectures/geog485_sp2014_01.pdf
	milestones/milestones.pdf
File naming and lecture processing updated.