Initial commit
Initial checkin
Merge remote-tracking branch 'choose_remote_name/master'
adding .gitingore file (using GitHub boilerplate) and fabfile init
Initial commit
removed OFFICE_ID from settings
latest version
Merge branch 'master' of https://github.com/badracket/br-django-uat.git

Conflicts:
	myproject/settings.py
	myproject/urls.py
moving fabfile to project root
Testing fab prepare_deploy
removing fpf app, changes to fabfile, and gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	README.md