CHECKOUT :: Order Confirmation Page
ADMIN :: Edits htaccess to Ignore Routing for Admin
Merge remote-tracking branch 'upstream/master'

Conflicts:
	public/css/styles.css