migration to add string attribute for biz hours each day of week
pulling down develop
merging user authentication
add new small logo
Merge branch 'style' into develop
Merge branch 'develop' of https://github.com/soolaimon/mobile_noms into develop
add two new logos
add margin -12 to .navbar-header img
changes link_to img to mobnom_logosm_b2.png
changed link_to img to b4
Merge branch 'develop' into profile

Conflicts:
	app/views/layouts/_nav.html.slim
finished file upload capability with carrierwave
Merge branch 'develop' of https://github.com/soolaimon/mobile_noms into develop
add style to user edit forms
add new logo
Merge branch 'develop' of https://github.com/soolaimon/mobile_noms into develop
Merge branch 'develop' of https://github.com/soolaimon/mobile_noms into develop
Merge branch 'develop' into profile
changed link_to img to b5
put trucks form in partial, same form for edit and new