Merge pull request #4 from jrelgin/dev/stylin

Dev/stylin
Merge branch 'master' of https://github.com/jrelgin/electriclantern into dev/stylin