Add delete subviews
Merge branch 'master' of github.com:joechee/doesntmatter

Conflicts:
	public/javascripts/client.js