end of day commit
Merge branch 'master' of github.com:chuckrea/setlist into development
merge conflict resolution
fixed setlist.rb