more formatting
Merge branch 'master' into Sharon
finished Weclome format
formatting income page
changed wording of income type
Merge pull request #50 from blind-squirrel/Sharon

Sharon
Merge pull request #51 from blind-squirrel/alex

Alex
Another Mass commit to fix things
Removed unused routes