Removed old script
Updated add roll script
Updated makeup
Merge remote-tracking branch 'origin/master'