btsync added to xinitrc
new btsync starter
new file
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.xinitrc