style changes
Merge branch 'master' of https://github.com/brian1987/ticktr-project