i don't know what has changed since the last time
returned port to random
this is ridiculous
sqllite?
Merge branch 'michelle2'

Conflicts:
	bin/run-web
really? this is getting ridiculous
fixed the stupid
Merge branch 'master' of http://github.com/vogelmi3-msu/cse491-drinkz
maybe things are sort of fixed now?