apo!
Merge branch 'master' into bachelor
made quotes in quotes (;-) even more pretty
merge
merge