initial repo setup
initial import of v3 code
Revert "initial import of v3 code"

This reverts commit 1e556fca4dc8baf30d9eb7b1ec0119a30efc6309.
Revert "initial repo setup"

This reverts commit 52540470dff035d1b3f8721d570d792bc5ad933e.
initial import of django project
Merge branch 'v4'

Conflicts:
	shiptrak/static/css/shiptrak.css
	shiptrak/static/img/about.png
	shiptrak/static/img/book14.gif
	shiptrak/static/img/close.png
	shiptrak/static/img/contact.png
	shiptrak/static/img/cross_circle_frame.png
	shiptrak/static/img/email.gif
	shiptrak/static/img/faq.png
	shiptrak/static/img/fullscreen.png
	shiptrak/static/img/guestbook.png
	shiptrak/static/img/link.gif
	shiptrak/static/img/link.png
	shiptrak/static/img/log.gif
	shiptrak/static/img/log.png
	shiptrak/static/img/mmsn-logo1a.gif
	shiptrak/static/img/mmsn_logo_small.png
	shiptrak/static/img/point.png
	shiptrak/static/img/point_red.png
	shiptrak/static/img/print.png
	shiptrak/static/img/printer01.gif
	shiptrak/static/img/qmark.png
	shiptrak/static/img/shiptrak1.jpg
	shiptrak/static/img/world.gif
adjusting settings importer for production deployments on heroku
updating production settings for heroku
updating requirements.txt
fixing databse config for heroku
adding psycopg2 to requirements
fix BASE_DIR in production
fixing wsgi settings for production
staticfiles wtf
Revert "staticfiles wtf"

This reverts commit d1023e22ec3b648d02fece1ca05bd0556356aebb.
adding .gitignore
adding production API key for google maps
removing google maps api key from script url
adding admin UI
adding grappelli