background
renew
reset
Merge remote-tracking branch 'origin/master'

Conflicts:
	Racecar/.idea/compiler.xml
	Racecar/.idea/copyright/profiles_settings.xml
	Racecar/.idea/encodings.xml
	Racecar/.idea/misc.xml
	Racecar/.idea/modules.xml
	Racecar/.idea/scopes/scope_settings.xml
	Racecar/.idea/uiDesigner.xml
	Racecar/.idea/vcs.xml
	Racecar/.idea/workspace.xml
	Racecar/src/FuelMeter.java
	Racecar/src/GameFrame.java
fixed
Merge branch 'master' of https://github.com/stanislavBozhanov/SoftUniTeamwork

Conflicts:
	Racecar/src/GameFrame.java
	Racecar/src/Road.java