Index page to website
Feature Change
new x
Updated Readme
Merge branch 'feature'
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.txt
Merge branch 'master' of https://github.com/githubteacher/hellogitworld
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/githubteacher/hellogitworld
Merge branch 'master' of https://github.com/githubteacher/hellogitworld
Merge branch 'master' of https://github.com/githubteacher/hellogitworld