tm - its making me commit before i pull
xMerge branch 'master' of github.com:deartrudence/blox
tm - added authorization
tm - minor changes with authorization