broke and fixed login
forced merge
till a merg?erge branch 'master' of https://github.com/cjames1224/AwesomeBox
Mergey?
 branch 'master' of https://github.com/cjames1224/AwesomeBox
almost fixed song controller