sync
sync2
Merge branch 'master' of https://github.com/spawndys/Cava

Conflicts:
	Documents/UIDD.doc