Octopress init
Site updated at 2013-11-19 23:49:35 UTC
Merge branch 'master' of github.com:edmondscommerce/edmondscommerce.github.io
install script
Merge branch 'master' of github.com:edmondscommerce/edmondscommerce.github.io
getting ruby working with rbenv
still working on wordpress migration, will run this from the office
Octopress init
Site updated at 2013-11-20 11:13:10 UTC
merged
Fixed merge conflict in the .gitignore file
Fixing merge conflicts