added data
resolved merge conflict

Merge branch 'master' of https://github.com/RyanNaughton/infrastructure

Conflicts:
	spatial.r