test commit
Merge branch 'LI_20130415' of https://github.com/saralarambhapuri/locationInfo into LI_20130415

Conflicts:
	Hello.rb