zillabyte/examples — pull request #7 by benjaminchan (2014-06-03 04:57:39+00:00)
Title: pull request: @sjarvie -- remove conflict

@sjarvie -- remove conflict