new branch
GITIGNORE
Merge branch 'master' of https://github.com/ngaikwad/usgm-demo

Conflicts:
	.gitignore
Merge branch 'master' into usgm-nilesh

Conflicts:
	app/Controller/CMSController.php
	app/Controller/FrontCMSController.php
	app/View/Elements/blue_square.ctp
	app/View/Elements/green_square.ctp
	app/View/Elements/orange_rounded.ctp
	app/View/Elements/orange_square.ctp
deleted gitignore
ckfinder files