added various proposal pages
merge commit
merge commit
changed gitignore and readme
removed redundant git diff files
removed redundant git diff files, pt 2
fixed navigation