Fix twiiter
Merge branch 'master' of github.com:setetres/starter