hardcode an image to use for profile pic, with border
Merge branch 'master' into default-image

Conflicts:
	Blurbly/Base.lproj/Main.storyboard
Merge pull request #33 from maml/default-image

Default image