development log bs
trying to merge master in
trying to have no problems with merge
added the twittername tests and got them to pass