Change Filename
.ignore
Merge branch 'dev'

Conflicts:
	.gitignore
Merge branch 'dev'
4:54 update protokol penelitian
Merge branch 'master' into dev
6:19 july 7 2014
6:34 july 7 2014