Admin

comm
App comp 7
First Admin
Merge branch 'master' into Admin
Conf

Confl
Confl

Confl
SeconAdm
UltAdm
A
Merge remote-tracking branch 'origin/Users'

Conflicts:
	bin/classes/com/example/prugit/MainActivity$PlaceholderFragment.class
	bin/classes/com/example/prugit/MainActivity.class
	src/com/example/prugit/MainActivity.java
Merge branch 'Admin'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/R.txt
	bin/classes/com/example/prugit/MainActivity.class
	bin/classes/com/example/prugit/R$id.class
	bin/classes/com/example/prugit/R$integer.class
	bin/classes/com/example/prugit/R$layout.class
	bin/classes/com/example/prugit/R$menu.class
	bin/classes/com/example/prugit/R$string.class
	bin/classes/com/example/prugit/R$style.class
	bin/classes/com/example/prugit/R$styleable.class
	gen/com/example/prugit/R.java
	res/layout/activity_main.xml
	res/values/strings.xml
	src/com/example/prugit/MainActivity.java
Merge branch 'master' into Users

Conflicts:
	bin/classes/com/example/prugit/MainActivity.class