renamed resume.txt -> README.md
1.1 -> 1.2
fixed issue with gitignore file
.gitignore should be working now
.gitignore should be working now
fixed conflict in .gitignore file
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	.gitignore
readme.md
1.2 -> 1.3
fixed conflict