Adding changes
Merge branch 'home'

Conflicts:
	_posts/2014-07-01-ruby-on-rails-layouts-and-rendering.markdown
	_posts/2014-07-02-ruby-on-rails-with-ajax-javascript.markdown