Hopefully fixed the set-up... Will implement .htaccess at a later date
Merge branch 'master' of https://github.com/ckubacak/piLab

Conflicts:
	login.php