Updating merge fail from Development branch
Updating merge fail from Development branch
Merge remote-tracking branch 'origin/master'
Merge branches 'gh-pages' and 'master' of github.com:y08507/ASD-TERM1310 into gh-pages

Conflicts:
	index.html