fixed stylesheet merge
<div></div>Merge branch 'master' of https://github.com/osofariu/trip_tracker