supression conneries
Merge branch 'master' of https://github.com/jocelyn44/carorbus/

Conflicts:
	carOrBus/war/index.html