add memo button
Merge branch 'master' of https://github.com/taoanton/tinymemo

Conflicts:
	TinyMemo/en.lproj/MainStoryboard.storyboard