added slide titles, and 2 new slides
added vim picture
added dinosaur graphic
positioning dinosaur graphic
fix sizing bug on main element
more front development
more dinosaur development
Merge branch 'master' into feature-dinosaur
added branches image
fix remaining dinosaur bugs ready for main line merge
Merge branch 'feature-dinosaur'
finished branch slide, added conflict slide
example change to demo conflict resolution
Merge branch 'feature-conflict-example'

Conflicts:
	index.html
added slide info about conflicts, and other techniques
updated margins