Add
created first iteration of desktop image selection using ini fgiles to determin where images come from. at the moment its just  local folder on the same machine
Merge origin/master

Conflicts:
	includes.php
	ini/toad-laptop.ini