win commit
Merge branch 'master' of https://github.com/taoanton/tinymemo

Conflicts:
	EKStreamView.h
	EKStreamView.m
	MyCell.h
	MyCell.m
	Pods/BuildHeaders/EKStreamView/EKStreamView.h
	Pods/Headers/EKStreamView/EKStreamView.h