i dunno man
Merge branch 'master' of github.com:billettta/beertracker
Merge branch 'master' of github.com:billettta/beertracker
changed some settings to get it serving from apache
Merge branch 'master' of github.com:billettta/beertracker

Conflicts:
	tracker/models.py