Fix stuff!

Conflicts:
	src/com/example/zonedhobbitsportfolio/ProfileActivity.java