some changes..
merge conflicts
gemfile
Merge branch 'master' into dev_nick
added clouds to twitter background
Merge pull request #7 from emacca/dev_nick

added clouds to twitter background