Merge pull request #19 from bchiatt/brian

spacing icons on navbar
updated dashboard exercise form
Merge pull request #20 from bchiatt/matt

updated dashboard exercise form
Merge pull request #21 from bchiatt/brian

profile page done for now
fixed merge conflict