多分ノートを送れると思う
Merge branch 'Evernote'

Conflicts:
	TimeIsMoney/FNViewController.m
プレゼン当日
Merge branch 'master' of https://github.com/bizancomSmartPhoneAppDeveloper2/TimeIsMoneyVer3