Commit changes
On branch 02-variables.tex
Changes to be committed:
	new file:   02-variables.tex
Update 02-variables.tex

User input
Update 02-variables.tex
Update 02-variables.tex
Update 02-variables.tex

Glosario
Commit changes to Chapter 2

Commit changes to Chapter 2
Merge remote-tracking branch 'origin/master' into 02-variables.tex

Conflicts:
	02-variables.tex
	book.sh
	code/gmane/d3.v2.js
	code/graphics/graphics.py
	code/mbox-short.txt
	code/mbox.txt
	code/pagerank/LICENSE
	code/pagerank/d3.v2.js
	code/pagerank/force.css
	code/pagerank/force.html
	code/pagerank/force.js
	createspace.sty
	.git/MERGE_HEAD
resolving conflict

resolving conflict
Merge pull request #4 from hedemarrie/02-variables.tex

02 variables.tex