Send New Message
gitignore
'dd'
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/profile.iml
	app/scripts/controllers/HomeCtrl.js
	app/scripts/controllers/IndexCtrl.js
	app/scripts/directives/newMessage.js
	app/scripts/services/CopyProfileService.js
	app/scripts/services/DataService.js