nn
Merge branch 'master' of https://github.com/jywu/StudySpace

Conflicts:
	res/layout/activity_edit_note.xml
Add Speech to text function
Merge branch 'master' of https://github.com/jywu/StudySpace