RAS
Merge branch 'master'

Conflicts:
	_posts/2014-12-12-Test.md