Added reference to base station code in base station section
Fixed merge errors
Merge branch 'master' of https://github.com/sgonzalez/wsn-parking-project
Worked on a bunch of random sections
merged