import project
Merge branch 'master' of github.com:janpoo/RoadCamera

Conflicts:
	.gitignore