Merge pull request #1 from lkozloff/master

testing pull requests
testing forks
Merge remote-tracking branch 'upstream/master'

Conflicts:
	locar.py