test

test
fixed <
deleted test.php
added .gitignore
Revert "added .gitignore"

This reverts commit 6d621cbda2b8e0cbfcd20137ccd62b7eb7e3963b.
add idea project, updated .gitignore
Basket, shop and order php

simple fixes to the db and new php files
idea project
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
fixed auth
user profile page added
shop working
final db working