Latest commit 79ea0bf Jan 16, 2017 2 Pixilate remove conflict