Commit before the merge
Merge branch 'master' of github.com:Bryan792/MobileCloset

Conflicts:
	src/com/mobilecloset/CategoryFragment.java