change pre master merge
updating with dev branch
Merge branch 'dev' into ajaxnewcheer
added the cheer to the list need to sort out the prepend to the cheer up index with out refreshing the page.
no changes
append the new cheer still not working
added the twitter gem
added a twitter initializer
added an if statement to the layout/views/application to add the gravatar statment to the banner, if person has signed on through email rather than twitter.
twitter feed added to the side bar on the side bar layout.  Not dynamic at the moment
added streamming info but not working
 the @cheers template for the new cheer with ajax
and deleted the link to new cheer

:wq
:wq

:wq
Merge branch 'dev' of github.com:lulumarshall/cheerups into dev
Merge branch 'ajaxnewcheer' into dev
Merge branch 'gravatarfix' into dev
merged the twitter feed branch but this is not fully finished
added dynamic tweets for if you have twitter username