Test update
Merge branch 'master' of https://github.com/oxos-net/oxos-net.github.com

Conflicts:
	_posts/kalendar/2013-02-01-mcr-2013.md