more style
style
Merge branch 'master' of github.com:coopermayne/party_tag
fixed merge conficts
first good style
Merge branch 'master' of github.com:coopermayne/party_tag
changed app title
Merge branch 'master' of github.com:coopermayne/party_tag