Trying to log times, still broken.
Trying to log times, still broken.
Merge branch 'ashwebb'

Conflicts:
	app/views/bottle.blade.php
About page edits