day 2 beginning of day commit
mend
fixed merge conflicts and untracked db files
added files to gitignore
linked pages and created models for picture to create color and picture objects