Merge branches 'gh-pages' and 'master' of http://www.github.com/theyapps/Tron
Merge pull request #4 from theyapps/gh-pages

Make up to date
Merge branch 'gh-pages'
Merge remote-tracking branch 'origin/master'
Merge pull request #5 from theyapps/master

Make up to date