Deleted all the features.
new feature from rajan
added second and third features
modified first feature, removed second feature
modified rajan's third feature, added fourth feature
Merge branch 'rajan' into develop

Conflicts:
	rajan.txt
test file
Merge branch 'develop'

# By Pradeep K Udupi (5) and Shyamala M (1)
* develop:
  test file
  modified rajan's third feature, added fourth feature
  modified first feature, removed second feature
  added second and third features
  new feature from rajan
  Deleted all the features.