Own computer for merge!
Merge branch 'master' of https://github.com/ollelind/DoStuff

Conflicts:
	DoStuff.xcodeproj/project.pbxproj
	DoStuff/CreateActivityViewController.m
	DoStuff/HeroViewController.m