bootstrap homepage, and sets up place holder content
fixes merge conflicts
Merge pull request #28 from coreyd303/home-page

bootstrap homepage, and sets up place holder content #27
fix merge conflicts