Txt changes
Merge branch 'master' of github.com:mensfeld/media-lab-2013-project