Merge remote-tracking branch 'origin/choigoon' into hagi4u

Conflicts:
	src/com/example/mindviewer/ManualActivity.java
added gitignore
ignore added