Merge pull request #1 from firefields/master

Update README
Testing
Merge pull request #2 from Callum-/master

testing pull request - callum
Automatic commit of irc logs
Update README
Testing git stuff

Brief notes on sensor types
Created high level block diagram of server hardware/software

I think this summarises what we discussed in our first meeting.
I may have gotten carried away.

The other approach suggested was to use some sort of custom hardware,
with a wireless link to a hand held device.

Making this diagram reinforces my belief that we shouldn't do that.
We'd have to implement the same blue stuff as well as all of the green stuff.
Also there would be more red stuff.

That's my technical explanation :P

Sam Moore
Add png version of block diagram
Automatic commit of irc logs
Merge remote-tracking branch 'upstream/master'
Merge pull request #5 from justinjessada/master

Testing git stuff
Add week 1 report
Update README

Actually make the README useful.
Automatic commit of irc logs
Investigate software for interfacing with hardware via HTTP requests

Investigated CGI scripts. Don't think they are feasable.

Currently investigating custom web server.
Used some existing files from a previous project
(network.h network.c log.h log.c).

I'm making some error in parsing the request, but out of time for now.
Merge branch 'master' of github:szmoore/MCTX3420
Makefile for webserver test

I always forget the Makefile.
More work on webserver test

It can send a text file straight to a client.

Something wierd happens.

If you use chrome to look at a html file, it displays fine.
If you use iceweasel (ie: firefox) to look at the same file, it just shows as plain text.

Using netcat to test, a real webserver just dumps html files the same way.
So what is (not) happening to make iceweasel fail to recognise it as html?
Add necessary HTTP response headers

Apparently chromium is smart enough to not need them, but I'm guessing other browsers do.
Automatic commit of irc logs