Merge branch 'master' of C:\Users\Eduardo\RubymineProjects\tadp with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	spec/azucar_sintactico_spec.rb
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Arreglos
Arreglos