Merge branch 'master' of https://github.com/angelceballos/personalblog

Conflicts:
	config/deploy.rb
Removed Old Deploy.rb