Working on updating fragment directory. Want to get changes from Brother
Merge branch 'master' of
https://github.com/ronaldsmartin/APO-DZ-Android.git

Conflicts:
	APO-DZ/src/org/upennapo/app/Brother.java
Made DirectoryDetails, more Directory fragment work
Merge branch 'master' of
https://github.com/ronaldsmartin/APO-DZ-Android.git

Conflicts:
	APO-DZ/res/values/strings.xml
	APO-DZ/src/org/upennapo/app/DirectoryFragment.java
shit works
names are messed up