some changes
Merge branch 'master' of github.com:trackography/trackography.github.io