grfe
Merge branch 'master' of https://github.com/Penguinatorr/MiList

Conflicts:
	MiList/bin/classes/com/cs252/milist/sharing/RecieveListActivity.class