this is to practise git branching and merging

<<<<<<< HEAD

=======

#some random text

copyright 2020 vagile tech all rights reserved

this line added to understand the rebase

19ed5f051d71ee162bcb62b8dc83be0ff018b36a

Name		Name	Last commit message	Last commit date
css		css
fonts		fonts
js		js
.gitignore		.gitignore
.htaccess		.htaccess
404.html		404.html
README.md		README.md
apple-touch-icon-precomposed.png		apple-touch-icon-precomposed.png
atch20.txt		atch20.txt
crossdomain.xml		crossdomain.xml
favicon.ico		favicon.ico
humans.txt		humans.txt
index.html		index.html
mallana		mallana
naresh		naresh
new.txt		new.txt
rishav		rishav
robots.txt		robots.txt
simple.html		simple.html