test code
Merge branch 'master' of https://github.com/rattanakchea/css422-Rango

Conflicts:
	Rango_test.X68