V1.1

edit code
Merge branch 'master' of https://github.com/ukrit-ruck/CSC319Project-G3-SIT-KMUTT

Conflicts:
	Thumbs.db