links and page2
erge branch 'master' of https://github.com/DFA-education/education

Conflicts:
	Public/pageTest2.html

  (use "git pull" to merge the remote branch into yours)