deletes unnecessary files....again?
Merge branch 'master' into goofed

Conflicts:
	public/test/index.html