Commit ad3c5009e5f802a555c0e2175827379b7a250302

  • Tree SHA1: 48289d5
  • Parent SHA1: d6760a5 (Integrate the PlayAreaView component)
  • Parent SHA1: e5cfd65 (Fixing UX of linked-data page.) 
Merge branch 'ocd' of github.com:janastu/swtr into ocd

Resolve Conflicts:
	swtr/static/js/main.js
	swtr/templates/index.html