main loop complete
file cleanup
p styles
Merge commit '6cf00714d45b7afdc2c2960c5aa7f956551be077' into socket

Conflicts:
	index.html
	server.js
Merge commit '85ad7fb39bf40dc3eaadace1552ee52de41e3880'
comment finished, faux results