Merge commit 'eac3fef6005a6fc40bf58b3ac1c154247214e0b7'

Conflicts:
	server.js
rewrote client side with angular js.  cleaned up server side a bit.  lost commit history so this is a mammoth, ugly commit