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 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