Function Trial
Function Trial
Merge branch 'gh-pages' of github.com:cam25/ObjectiveC

Conflicts:
	CamWeek3/CamWeek3.xcodeproj/project.xcworkspace/xcuserdata/cameronmozie.xcuserdatad/UserInterfaceState.xcuserstate
	CamWeek3/CamWeek3.xcodeproj/xcuserdata/cameronmozie.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
Function