changes and shizz
Merge branch 'master' of git://github.com/ndhoule/dott
Merge pull request #7 from kwalker3690/master

I'm going through changes