same
git ignore add
Merge branch 'carbogrids' of github.com:Inmmelman/ufotaxi into carbogrids

Conflicts:
	www/.idea/workspace.xml
add restfull api controller