Feature 2
Merge branch 'master' of github.com:amathiyazhagan/GitWS-1 into abc

Conflicts:
	Feature_one.js