Merge pull request #1 from ifaniqbal/master

tarik
Add View MengerjakanResep
Finish MengerjakanResep
add views and controller pengadaan obat
Merge branch 'Angga'
Merge branch 'master' of https://github.com/Satisfy/ApotekMedicalCenter into Farhan

Conflicts:
	ApotekMedicalCenter/ApotekMedicalCenter.csproj
	ApotekMedicalCenter/App.xaml
Merge Branch Hashfi
Commit Progress 1 {merge from all team members}