working on profile
still working
some divs and cols to start on profile
resolved merge conflicts
Merge branch 'master' of github.com:lalanikki/habit-app