Started Story 13
data can be requested and is sent to the client now
Story 13 web page receiving some information now
fix conflicts
fixed more conflicts
Merge branch 'master' of https://github.com/jesiryan/DoesThisBreakThings.git