nothing much to report
Merge https://github.com/zman1696/store_repo
set up a test page for python
just messin aboot
minor stuff
Merge https://github.com/zman1696/store_repo
Merge https://github.com/zman1696/store_repo
Merge https://github.com/zman1696/store_repo
Merge https://github.com/zman1696/store_repo
yeeeee
Merge https://github.com/zman1696/store_repo

Conflicts:
	Purchase.py
Merge https://github.com/zman1696/store_repo
why do you ne4ed as message!!!!!!!!!!!!!!!!!
Merge https://github.com/zman1696/store_repo
woo
Merge https://github.com/zman1696/store_repo
Merge https://github.com/zman1696/store_repo
Merge https://github.com/zman1696/store_repo
yeeeee
Conflicts:
	catalogue.html
	index.html
Merge https://github.com/zman1696/store_repo
ye
Merge https://github.com/zman1696/store_repo
almost done