all the changes from out last meeting: random buttons and the person icon
Person icon and layout tid bits from our last meeting.
Merge branch 'master' of https://github.com/swansond/Recreativity

Conflicts:
	res/layout/activity_main.xml