Merge pull request #21 from Align/master

updated linkname
Merge pull request #22 from Align/master

match to master
daves updates

changed padding to margin and px to %, changed file path for imgs, and
copied template to userMgmt page
minor changes
Merge pull request #23 from Align/Davids-Dev

Davids dev