modify gitignore
Merge branch 'master' of https://github.com/ychen022/intelliguide

Conflicts:
	src/srb/headset/intelliguide/MainActivity.java
Merge branch 'master' of https://github.com/ychen022/intelliguide
add listener
change sound files