Removed unnecessary files
Merge branch 'master' of https://github.com/sethicis/cs405G_StoreFront
Merge branch 'master' of https://github.com/sethicis/cs405G_StoreFront
Merge branch 'master' of https://github.com/sethicis/cs405G_StoreFront
Merge branch 'master' of https://github.com/sethicis/cs405G_StoreFront
Merge branch 'master' of https://github.com/sethicis/cs405G_StoreFront
Merge branch 'master' of https://github.com/sethicis/cs405G_StoreFront
Merge branch 'master' of https://github.com/sethicis/cs405G_StoreFront
Merge branch 'master' of https://github.com/sethicis/cs405G_StoreFront
Merge branch 'master' of https://github.com/sethicis/cs405G_StoreFront
Merge branch 'master' of https://github.com/sethicis/cs405G_StoreFront
Merge branch 'master' of https://github.com/sethicis/cs405G_StoreFront
Merge branch 'master' of https://github.com/sethicis/cs405G_StoreFront
Debugging special case error in DB code
Merge branch 'master' of https://github.com/sethicis/cs405G_StoreFront

Conflicts:
	promotions.php
Merge branch 'master' of https://github.com/sethicis/cs405G_StoreFront
Merge branch 'master' of https://github.com/sethicis/cs405G_StoreFront
Merge branch 'master' of https://github.com/sethicis/cs405G_StoreFront
Merge branch 'master' of https://github.com/sethicis/cs405G_StoreFront
Merge branch 'master' of https://github.com/sethicis/cs405G_StoreFront