Fix cat bug
Merge branch 'admin'
Create jane_new_file
Add line to cat.txt
Merge branch 'master' of https://github.com/jeffreyfultonca/store
Update README
Merge branch 'master' of https://github.com/jeffreyfultonca/store
Update README
Merge branch 'master' of https://github.com/jeffreyfultonca/store

Conflicts:
	README.txt
Add cart.txt
Add line to cart.txt
This should cause a conflict
Merge branch 'master' into admin

Conflicts:
	admin/dashboard.html