Merge branch 'develop'
trditional resume4
Merge branch 'develop'

Conflicts:
	images/icons/yes.png
	index.html
	js/jquery.js
Merge branch 'master' into develop
Revert 38b70c2..cc60a33

This rolls back to commit 38b70c2766b00e10966bb288b6f8f9c8d7c6098d.