conflicted file removed
pill partial
Merge pull request #42 from stuartstein/pillspartial

Put pillbox in partial
remove completion bug fix
fixed turbolinks issue
Merge pull request #43 from perez-e/daybox-v-3

Daybox v 3
ughhh stupid navbar works
Update _navbar.html.erb
Merge pull request #44 from lalanikki/navbar_rework

ughhh stupid navbar works
navvy nav
Merge branch 'master' of github.com:lalanikki/habit-app
conflict resolved
navbar for realz this time
Merge pull request #46 from lalanikki/heroku_navbar

navbar for realz this time
refactored javascript
pills with unique ids
cycling through weeks in habits index page
fixed arguement error bug in partial
fixed bugs on day-pill clicks
trying to fix posts added some fields to registration and profile  changed seed data to add profiles