Added priorities to favourites, so we can resolve clashes. Added clash-resolving...
tree5f3d3c539a52836e2c8a156941da8ded8e19b03e
-rw-r--r-- 17 .gitignore
drwxr-xr-x - cronscripts
drwxr-xr-x - include
drwxr-xr-x - playonwii
drwxr-xr-x - scripts
drwxr-xr-x - src