a
Merge remote-tracking branch 'origin/master'

Conflicts:
	1.html
	css/main.css
	css/mainie.css
	css/mainie2.css
	js/page1.js
	js/page2.js
	js/page3.js
	js/page4.js