unificando as versões
resolvendo conflitos 10-03 pt 2

Tentando estabelecer uma versão base para análise de conflitos
resolvendo conflitos 10-03 pt3
Merge branch 'master' of https://github.com/danillobatista/Oficina2014.1

Conflicts:
	.gitignore
	New Unity Project 1/Assets/scripts/GlossaryBehavior.js
	New Unity Project 1/Assets/scripts/GlossaryControl.js
	New Unity Project 1/Assets/scripts/TextControl.js
	New Unity Project 1/Library/metadata/1d/1d3bb83d2d2fd044da6b6cff95f4ae82
	New Unity Project 1/Library/metadata/4a/4a36cd02caf2dbd4cb04a89b739ae42d
	New Unity Project 1/Library/metadata/aa/aa559c1a9efc4f44c97dcd46edbaf4ec
	New Unity Project 1/Library/metadata/d1/d10d411bd7b7bc04899fbc1123c61d04
	New Unity Project 1/New Unity Project 1.userprefs

Resolvendo conflitos tentando gerar versao base