v

fsdf
ssa

ass
Merge branch 'master' of https://github.com/Ipmedt4b/Project4

Conflicts:
	IPMEDT/AndroidManifest.xml
	IPMEDT/gen/com/example/ipmedt/R.java
	IPMEDT/res/layout/activity_main.xml
	IPMEDT/res/layout/fragment_main.xml