change linting
Merge commit 'f8261b00d33eacc0ff52342ecdce386051fe1ba7' into HEAD
Merge commit 'e2db38d419b231da50ff6a7cf22f36aa95360042' into HEAD
Merge commit 'f5df7ebc985aac709b166dfe878c843f334550f4' into HEAD
Merge pull request #5 from 60frames/master

merging