add_report() now contains query bindings (for the last query)
add_report() now contains query bindings (for the last query)
add_report() now contains query bindings (for the last query)
Merge branch 'master' into HEAD

Conflicts:
	application/models/report_model.php
Mid Risk is now Medium Risk; edited formatting to be more consistent
Merge branch 'master' of https://github.com/obs619/safetrip
Merge branch 'master' of github.com:obs619/safetrip

Conflicts:
	application/controllers/home.php
	application/models/report_model.php
Fixed home controller to match Oliver's commit; possible merging error
Logo image on the navigation bar