add picks 24/7
merge conflicts ftw
Merge branch 'source' of github.com:vienna-rb/vienna-rb.github.com into source

Conflicts:
	source/_posts/2013-07-24.markdown