Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
small edit for monk in moscow post

small edit for monk in moscow post
Merge branch 'develop' into gh-pages

Conflicts:
	_posts/2014-05-17-monk-in-moscow.markdown
update monk post
cv changes
Merge branch 'develop' into gh-pages

Conflicts:
	_posts/2014-05-17-monk-in-moscow.markdown
ammends
amends
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
cv update
Merge branch 'develop' into gh-pages

Conflicts:
	cv/index.markdown
correct conflict
resolve conflict resolution
Merge branch 'gh-pages' into develop