Getting Jack back on track
Merge branch 'master' of https://github.com/JBLowrie/carjx

Conflicts:
	css/images/Thumbs.db
	css/images/ui-bg_flat_30_cccccc_40x100.png
	css/images/ui-bg_flat_50_5c5c5c_40x100.png
	css/images/ui-bg_glass_20_555555_1x400.png
	css/images/ui-bg_glass_40_0078a3_1x400.png
	css/images/ui-bg_glass_40_ffc73d_1x400.png
	css/images/ui-bg_gloss-wave_25_333333_500x100.png
	css/images/ui-bg_highlight-soft_80_eeeeee_1x100.png
	css/images/ui-bg_inset-soft_25_000000_1x100.png
	css/images/ui-bg_inset-soft_30_f58400_1x100.png
	css/images/ui-icons_222222_256x240.png
	css/images/ui-icons_4b8e0b_256x240.png
	css/images/ui-icons_a83300_256x240.png
	css/images/ui-icons_cccccc_256x240.png
	css/images/ui-icons_ffffff_256x240.png
	css/jqueryCalendar.css
	js/jquery-1.6.2.min.js
	js/jquery-ui-1.8.15.custom.min.js