Fix
Merge branch 'master' of https://github.com/colmsjo/develvm

Conflicts:
	html/learn-react-1/index.html
	html/learn-react-1/index2.html