added incomplete note conversion functions
commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/getFreq.js
	js/main.js