merge
page_control
Merge branch 'master' of https://github.com/WunGCQ/swdwonproject

Conflicts:
	js/page_control.js