First commit
first commit
Merge https://github.com/zman1696/store_repo

Conflicts:
	index.html
Merge https://github.com/zman1696/store_repo

pulling !!!!
Merge https://github.com/zman1696/store_repo