first commit
blablabla
ldksdf
Merge github.com:zman1696/store_repo

Conflicts:
	index.html
	test.txt
Merge github.com:zman1696/store_repo

Conflicts:
	index.html
	test.txt
Merge github.com:zman1696/store_repo