Hashmap addition
Hashmap addition
"Fixed merging issues"
Merge branch 'master' of https://github.com/Bits-Please/global.hackathon

Conflicts:
	Teams/Bits-Please/index.html
	Teams/Bits-Please/speech-recognizer.js
FIXED EVERYTHINGgit add *git add *git add *
Merge pull request #14 from mehrabrym/master

CHANGED AND FIXED EVERYTHING!!!