trying to fix conflicts
what i dont get it
Now I'm pulling I guess
Merge branch 'master' of https://github.com/jmalley/jmalley.github.io into source
Changed destination of build
Changed deploy script again
changed rakefile to force the push, tweaked css for highlighted code