solved issues #2 and created page for #3, privacy page content still needs to be filles in
solved merge conflict