high voltage in progress
create the the About us page
fixed merge conflicts
changed te about page from a static to belonging to user views
fixed conflicts
try to change some style
merged master