move this up one dir and make app callled 'phonegap-app' -sam
not sure why it's making me commitright now
not sure why it's making me commitright now
added speech reco commands for setting, contact favorites help
added my section of voice cmds
resolving conflicts...
more conflict resolution
Voice Command for Weather is done
Merge branch 'wes_weather_command'
Merge and voice command for weather is done
Fix the merge
Merge branch 'ari_speech'

Conflicts:
	public/js/mvc.js
Continued testing with speech and TTS.
No change in problems from previous commit.