.DS_Store (how the hell can I add these to my gitignore file???
fixed merge conflict
added public info page