tried to push changes made by karan jut for test
testing push - added karans changes
tried to push karans changes as a test
Merge github.com:Bizlogisticx/bizlogisticx

Conflicts:
	log/development.log
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
	tmp/pids/server.pid

test
test by boji to test the push