First upload from linux
Second commit from linux
thid commit from linux
Merge branch 'master' of https://github.com/critnal/www

Conflicts:
	maccas/dbGet.php
	maccas/dbUpdate.php
	maccas/index.html
	maccas/login.php