fixed everything
fixed after merge
added new file test1
Merge pull request #2 from yorume/manohar_branch

Manohar branch