committing to merge
merging
improvements to nav and headers, and cleaned up code, still need to format modal and home page
merging changes, removed progress bars to push change, not in my version
merged with progress bars