test

test
Basket, shop and order php

simple fixes to the db and new php files
Upload

Uploading entire file
Got shop working
gitignore
Merge branch 'dorianbranch' into testmerge

Conflicts:
	.gitignore
	.htaccess
	auth.php
	nbproject/project.properties
	nbproject/project.xml
	register.php
	simpleGymDB.sql
	test.html
basket working