checkout
Merge pull request #6 from maheshghanta/checkout

checkout
Merge branch 'master' into fullservice

Conflicts:
	config/routes.rb