tambah isi laporan
Merge branch 'master' of https://github.com/sharonrh/Gamma

Conflicts:
	Project/gen/com/example/gamma/R.java
	Project/res/layout/fragment_laporan.xml
	Project/src/view/LaporanFragment.java
	Project/src/view/MainActivity.java