Merge branch 'master' of https://github.com/Wyck/wd4-ajax

Conflicts:
	regex/index.html
Commit

Commit
Merge branch 'master' of https://github.com/Wyck/wd4-ajax

Conflicts:
	regex/index.html