Trying to merge
trying to merge!!!!!!!!!!Merge branch 'master' of https://github.com/arikalfus/Jeeves

Conflicts:
	public/js/mvc.js
Merge branch 'master' of https://github.com/arikalfus/Jeeves
Merge branch 'master' of https://github.com/arikalfus/Jeeves
Merge branch 'master' of https://github.com/arikalfus/Jeeves
c
adding speech commands
Merge branch 'master' of https://github.com/arikalfus/Jeeves into burak

Conflicts:
	public/js/mvc.js
Merge branch 'master' into ari_speech