Merge pull request #18 from indraneeldey/development

Development
lala
Update lala.txt
test changes from neel
Merge branch 'master' into development