Isaac helped with this to avoid a conflict

Merge branch 'master' of github.com:jloehman/Party_Blueprint
Merge branch 'master' of github.com:jloehman/Party_Blueprint