colors
Added pads to turn channels on and off.
Merge branch 'master' into dr

Conflicts:
	Wilson.xcodeproj/project.pbxproj
	Wilson/WILRecordViewController.m
merged stuff.
Merge pull request #5 from evilstudios/dr

Dr
Merge branch 'master' into filter-collection

Conflicts:
	Wilson/WILRecordViewController.m