commit
Merge branch 'master' of https://github.com/geek-paulwong/Penguin

Conflicts:
	Penguin/PageContentViewController.h
	Penguin/StartViewController.h
	Penguin/StartViewController.m