Updating jQuery use
updating js functionality
checking js
 used rake update_source
Updating octopress off master
Resolving conflicts
Resolving conflicts
Rake minify added
Trying to get theupdate right
updating gemfile
Merge pull request #13 from ColetteIsabella/master

Resolving Master
Merge pull request #14 from ColetteIsabella/source

Trying to get everything talking.