deleted:    RandomCode.php
	modified:   bootstrap/css/boot.css
	modified:   bootstrap/css/boot.css~
	modified:   bootstrap/css/bootstrap-responsive.css
	modified:   bootstrap/css/bootstrap-responsive.min.css
	modified:   bootstrap/css/bootstrap.css
	modified:   bootstrap/css/bootstrap.css~
	modified:   bootstrap/css/bootstrap.min.css
	modified:   bootstrap/img/abcd.jpg
	modified:   bootstrap/img/capture.png
	modified:   bootstrap/img/capture2.png
	modified:   bootstrap/img/glyphicons-halflings-white.png
	modified:   bootstrap/img/glyphicons-halflings.png
	modified:   bootstrap/img/greatdealhere.jpg
	modified:   bootstrap/js/bootstrap.js
	modified:   bootstrap/js/bootstrap.min.js
	modified:   bootstrap/js/jquery.js
	modified:   dropdown.html
	modified:   php/class/account.php
	new file:   php/class/address.php
	modified:   php/class/category.php
	modified:   php/class/company.php
	modified:   php/class/contacts.php
	modified:   php/class/database.php
	modified:   php/class/log.php
	modified:   php/class/person.php
	modified:   php/class/personaccount.php
	new file:   php/class/randomcode.php
	modified:   php/class/session.php
	modified:   php/class/sessionhandler.php
	modified:   php/class/validation.php
	modified:   php/class/validation.php~
	modified:   php/controller/admin/addCategory.php
	new file:   php/controller/admin/addCompany.php
	modified:   php/controller/admin/adminHomepage.php
	modified:   php/controller/login.php~
	modified:   php/controller/loginpage.php
	modified:   php/controller/logout.php
	modified:   php/controller/session.php
	modified:   php/index.php
	modified:   php/view/admin/addCategory.php
	new file:   php/view/admin/addCompany.php
	modified:   php/view/admin/adddeal.php
	new file:   php/view/admin/categoryTable.php
	modified:   php/view/admin/merchants_homepage.php
	modified:   php/view/admin/nav.php
	modified:   php/view/banner.php
	modified:   php/view/content_contact.php
	modified:   php/view/fns.php
	modified:   php/view/footer.php
	modified:   php/view/header.php
	modified:   php/view/login_form.php
	modified:   php/view/nav.php
	modified:   ramrodeal.sql
	modified:   rand.php
	modified:   test.php