Added users and car instances into car_gen
Merge remote-tracking branch 'origin/master'

Conflicts:
	carrental/views.py
Merge branch 'master' of https://github.com/jyzackoh/carrental

Conflicts:
	carrental/views.py