troditional resume 1
trdition resume 1
trditional resume 2
ses.js
test
trdition resume 2
troditional resume 3
troditional resume 5
troditional resume 7
troditional resume 8
slide1
trditional revise
Merge branch 'develop'

Conflicts:
	images/icons/yes.png
	index.html
	js/jquery.js