add phones
Merge branch 'add-phones' of git://github.com/xicreative/gitme into xicreative-add-phones

Conflicts:
	config/routes.rb