Delete file
Web application database SQL,PHP, JS, BootStrap - educaion
Merge branch 'master' of https://github.com/darkkardinal/edu

Conflicts:
	index.php
	nbproject/project.properties
	nbproject/project.xml
Merge branch 'master' of https://github.com/darkkardinal/php