20140106 changed

 不要なコードの削除
Merge branch 'master' of https://github.com/Fumiaki0604/iOS_template

Conflicts:

iOS_template/iOS_template.xcodeproj/project.xcworkspace/xcuserdata/Fumia
kiSatou.xcuserdatad/UserInterfaceState.xcuserstate

iOS_template/iOS_template.xcodeproj/xcuserdata/FumiakiSatou.xcuserdatad/
xcdebugger/Breakpoints_v2.xcbkptlist

iOS_template/iOS_template.xcodeproj/xcuserdata/FumiakiSatou.xcuserdatad/
xcschemes/iOS_template.xcscheme

iOS_template/iOS_template.xcodeproj/xcuserdata/FumiakiSatou.xcuserdatad/
xcschemes/xcschememanagement.plist
	iOS_template/iOS_template/SecondViewController.m
	iOS_template/iOS_template/ViewController.m