Refactor
Update Webstorm
Merge branch 'gh-pages' of github.com:y08507/ASD-TERM1310

* 'gh-pages' of github.com:y08507/ASD-TERM1310:
  Update Webstorm
  Refactor

Conflicts:
	.idea/workspace.xml