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

Conflicts:
	js/admin.js