bullshit spacing
Merge remote-tracking branch 'origin/master'
changes about page contact email to not be belligerent
Merge remote-tracking branch 'origin/master'