just synching yo
Merge branch 'master' of https://github.com/CorpusCallosum/EphemeralArchitecture

Conflicts:
	lanscapesC_kinect/bin/data/background.jpg