more debugging
Merge branch 'master' of github.com:rajofchennai/apigee-hacathon

Conflicts:
	app/controllers/home_controller.rb
Merge remote-tracking branch 'origin/master'