Got rid of random file
Add Overstock.com items to database, can't display them
overstock and ebay functions called from  functions.php wrapper functions, myItems works
untrack items.
Merge branch 'overstock' of https://github.com/nateharner01/394-receipt-parser into develop
Revert "Got rid of random file"

This reverts commit 7f6160fa6c902e1c4a00460c36d1eb4665c51746.
Bug fix on myItems
Merge branch 'overstock' into develop
show delete msg
overstock merge
sort
edit price
Some final changes before demo
Bug fix for release
Merge branch 'develop'

Conflicts:
	backups/databaseLogin.php