u
Merge branch 'master' of github.com:duleorlovic/blog

Conflicts:
	_posts/2014-07-02-ruby-on-rails-with-ajax-javascript.markdown
Adding some text