Resolve merge conflicts
Merge branch 'master' of github.com:stevenpetryk/partygoer
Merge branch 'master' of github.com:stevenpetryk/partygoer
Merge branch 'master' of github.com:stevenpetryk/partygoer
Merge branch 'master' of github.com:stevenpetryk/partygoer