changed some formatting
Merge branch 'master' of github.com:MPowered-TechTeam/here
edit functionality
nav formatting
fix email bugs
merge conflict