playing with minical
fixed merge in views.py
changed layout of calendar
Merge https://github.com/rodmk/packplanner
fixing merge again
still fixing merge