Ha! no name is good name :)
	modified:   readme.md
	modified:   index.php
	modified:   site/config.php
	modified:   site/controller/welcome.php
	modified:   site/model/check.php
	modified:   site/config.php
	new file:   .gitmodules
	new file:   engine
	.htaccess
	index.php
	readme.md
	site/
	new file:   .htaccess
	new file:   index.php
	new file:   readme.md
	new file:   site/config.php
	new file:   site/controller/welcome.php
	new file:   site/index.html
	new file:   site/model/check.php
	new file:   site/view/check_test.php
Merge branch 'master' of github.com:piyushmishra/sambhuti

Conflicts:
	.gitmodules
	index.php

	new file:   frame-core
	modified:   index.php
	deleted:    frame-core
	deleted:    frame-core
	modified:   engine
	modified:   index.php
	modified:   site/controller/welcome.php
	new file:   .gitmodules
	new file:   .htaccess
	new file:   engine/core/SBException.php
	new file:   engine/core/SBbase.php
	new file:   engine/core/config.php
	new file:   engine/core/controller.php
	new file:   engine/core/load.php
	new file:   engine/core/model.php
	new file:   engine/core/request.php
	new file:   engine/core/sambhuti.php
	new file:   engine/core/uri.php
	new file:   engine/index.html
	new file:   engine/init.php
	new file:   engine/lib/dao.php
	new file:   engine/lib/database.php
	new file:   engine/lib/index.html
	new file:   engine/lib/notifier.php
	new file:   engine/lib/request.php
	new file:   engine/lib/session.php
	new file:   engine/lib/uploader.php
	new file:   engine/lib/validator.php
	new file:   engine/readme.md
	new file:   engine/thirdparty/Pimple
	new file:   index.php
	new file:   readme.md
	new file:   site/config.php
	new file:   site/controller/welcome.php
	new file:   site/index.html
	new file:   site/model/check.php
	new file:   site/view/check_test.php
Merge branch 'master' of github.com:piyushmishra/sambhuti

Conflicts:
	.gitmodules
	.htaccess
	engine

	modified:   .gitmodules
	modified:   .htaccess
	deleted:    engine/core/SBException.php
	deleted:    engine/core/SBbase.php
	deleted:    engine/core/config.php
	deleted:    engine/core/controller.php
	deleted:    engine/core/load.php
	deleted:    engine/core/model.php
	deleted:    engine/core/request.php
	deleted:    engine/core/sambhuti.php
	deleted:    engine/core/uri.php
	deleted:    engine/index.html
	deleted:    engine/init.php
	deleted:    engine/lib/dao.php
	deleted:    engine/lib/database.php
	deleted:    engine/lib/index.html
	deleted:    engine/lib/notifier.php
	deleted:    engine/lib/request.php
	deleted:    engine/lib/session.php
	deleted:    engine/lib/uploader.php
	deleted:    engine/lib/validator.php
	deleted:    engine/readme.md
	deleted:    engine/thirdparty/Pimple
	deleted:    engine/core/SBException.php
	deleted:    engine/core/SBbase.php
	deleted:    engine/core/config.php
	deleted:    engine/core/controller.php
	deleted:    engine/core/load.php
	deleted:    engine/core/model.php
	deleted:    engine/core/request.php
	deleted:    engine/core/sambhuti.php
	deleted:    engine/core/uri.php
	deleted:    engine/index.html
	deleted:    engine/init.php
	deleted:    engine/lib/dao.php
	deleted:    engine/lib/database.php
	deleted:    engine/lib/index.html
	deleted:    engine/lib/notifier.php
	deleted:    engine/lib/request.php
	deleted:    engine/lib/session.php
	deleted:    engine/lib/uploader.php
	deleted:    engine/lib/validator.php
	deleted:    engine/readme.md
	new file:   engine/core/SBException.php
	new file:   engine/core/SBbase.php
	new file:   engine/core/config.php
	new file:   engine/core/controller.php
	new file:   engine/core/load.php
	new file:   engine/core/model.php
	new file:   engine/core/request.php
	new file:   engine/core/sambhuti.php
	new file:   engine/core/uri.php
	new file:   engine/index.html
	new file:   engine/init.php
	new file:   engine/lib/dao.php
	new file:   engine/lib/database.php
	new file:   engine/lib/index.html
	new file:   engine/lib/notifier.php
	new file:   engine/lib/request.php
	new file:   engine/lib/session.php
	new file:   engine/lib/uploader.php
	new file:   engine/lib/validator.php
	new file:   engine/thirdparty/Pimple
	modified:   engine/lib/database.php
	modified:   engine/lib/database.php
	modified:   engine/lib/database.php
	modified:   engine/lib/database.php
	modified:   engine/core/load.php
	deleted:    engine/lib/dao.php
	deleted:    engine/lib/database.php
	new file:   engine/core/database.php
	modified:   engine/core/uri.php