...
Merge branch 'master' of https://github.com/JiaoLiu/GoldenRuler

Conflicts:
	.DS_Store