bactc
Merge branch 'master' of https://github.com/bachtx/BookStore_Online

Conflicts:
	.htaccess
	css/style.css