formatting things
Merge branch 'master' of github.com:brian1987/ticktr-project