moving buttons
merged in master changes
header updates
Merge branch 'master' into updated-profile
Merge pull request #46 from zsherman/updated-profile

Updated profile