issuee 1 parke
master finisehd
Merge branch 'Issue1'

Conflicts:
	helloworld.htm
Merge branch 'master' of github.com:Virrtuo/demo

Conflicts:
	helloworld.htm