obstacles "working"
Merge branch 'master' of github.com:kweekly/sensezilla-matlab

Conflicts:
	.gitignore