Modificare jwd2
Merge branch 'BranchCristi' of github.com:jordachewd/mystuff into BranchCristi

Conflicts:
	index.html