Removed conflicting script, added unlisted pages to test.html
Merge branch 'web' of https://github.com/jaggs6/dskyas into web

Conflicts:
	css/bootstrap.css