Did task one.
Task thrree.
Merge branch 'new-feature' of https://github.com/Cananito/SurfShackTest into new-feature

Conflicts:
	SurfShackTest/SSTAppDelegate.m
Merge branch 'new-feature'
Git didn't merge the third method correctly.