Update

Mostly transfering things to index.php and adding random pages
Merge branch 'master' of https://github.com/amose679/Marketplace

Conflicts:
	indexPage.css
conflict