Merge branch 'integration' of https://github.com/Eagleo0/live
removed index.html
Added abdul.txt
deleted abdul
added
Updated to latest status
Added db.php to .gitignore
Merge branch 'integration' of https://github.com/Eagleo0/live into integration

test
Merge branch 'integration' of https://github.com/Eagleo0/live into integration
Merge branch 'tobi' of https://github.com/Eagleo0/live into integration

Conflicts:
	index.php
Merge branch 'integration' of https://github.com/Eagleo0/live into integration