deleted comments and conflicted old markup in header; about us page deleted progress bar widget
Merge pull request #27 from conman246/front_end_changes

deleted comments and conflicted old markup in header; about us page dele...