week 3
week 3
Merge branch 'develop' for Release #2
Merge branch 'develop'

Conflicts:
	backups/databaseLogin.php
Merge branch 'develop'

Conflicts:
	backups/databaseLogin.php
	backups/itemSample.php
	backups/searchSample.php
css changes
Edited search item table appearance
Made results in itemSample.php into a table, to allow for future formatting
Changed table style, filenames
changed more filenames
Merge branch 'develop'
Merge branch 'master' of https://github.com/nateharner01/394-receipt-parser

Conflicts:
	searchResults.php
Fixed table class in search results
Fixed filenames in deleteitems
fixed table class in searchResults (actually)
Centered search results
centered SetNotificationPrices table
Added price to search results page
Merge branch 'master' of https://github.com/nateharner01/394-receipt-parser