Added main screen
Merge remote-tracking branch 'origin/master'

Conflicts:
	CarPal.iml
iml