Merge branch 'master' of https://github.com/Affino/AffinoTest2

Conflicts:
	Hello.cfm
changed