ListVoyages(incomplete)
Merge branch 'master' of https://github.com/ozen/cs353-project

Conflicts:
	buscompany/templates/main.html
	db.sqlite3
	project/urls.py