Merge pull request #2 from akashu/Test-Branch

Test branch
Code added in master to check for conflict
hi this is test
code commit for github merge functionality
Merge branch 'master' into mynewfeature
Merge branch 'mynewfeature'
ignore files
Ignore file
test.php
code commit before ignoring this folder
Merge branch 'master' of https://github.com/akashu/Test-Repository
code commit to test git ignore working or not
code commit to test git ignore working or not
code commit for
code commit to remove the ignore repo
code commit to see ignore
code commit to ignore
code commit to test branch
Merge pull request #4 from akashu/mybranch

code commit to test branch
vilas commit