to
Merge branch 'www' of github.com:danmandle/spotiparty into www

* 'www' of github.com:danmandle/spotiparty:
  removed a conflict