feature: initial html structure & content
Merge branch 'master' into home_page
Pulling in any recent changes to current branch
feature: hierarchy and links for home page created
no styling within page
bug_fix: merged conflicts to be up to date
bug_fix: removed HEAD>>> left over from merging
Merge pull request #16 from 4justinstewart/home_page

Home page