노래 추가
progress bar
///
Merge branch 'choigoon' of
https://github.com/Family-of-loves/MindViewer.git into choigoon

Conflicts:
	res/layout/activity_manual.xml
	src/com/example/mindviewer/ManualActivity.java
Merge remote-tracking branch 'origin/choigoon' into hagi4u

Conflicts:
	src/com/example/mindviewer/ManualActivity.java
Merge remote-tracking branch 'origin/choigoon' into hagi4u
added gitignore
ignore added
fixed
##need fix mindviewer