05-30

v1.7 2:34
Merge branch 'master' of https://github.com/hellopapercut/hellopapercut.github.com

Conflicts:
	img/fig1.jpg
	img/fig2.jpg
	img/fig3.jpg