Merge branch 'master' of https://github.com/unexpected-lion/ourglass
Add style-guide.md
Add style-guide.md file
Merge branch 'master' of https://github.com/bisutun/ourglass
Add style-guide.md
Merge branch 'master' of https://github.com/bisutun/ourglass into bisutun-master
Merge branch 'bisutun-master'
Merge pull request #4 from bisutun/master

Add style-guide.md file