added welcome.html
Merge branch 'master' of heroku.com:enkitest

Conflicts:
	html/welcome.html
renamed welcome.html