Merge pull request #1 from blainefricks/master

merging master into staging
Merge branch 'master' into staging
v1.1.2

Corrected padding on primary navigation list items.
conflict

Git created an unknown conflict. Possibly caused by switching branches
while having files open?