Pixel pushing, first shot at syncing
Merge pull request #94 from mlorbetske/master

Pixel pushing, first shot at syncing