commiting so i may pull
fixed diff and added the twitter feed
fixed diff