fixes merge conflict
fixes merge conflict
commiting to pull upstream
added foundation to the homepage
fixing merge conflict
added styling to the homepage
Merge pull request #24 from aelevy44/master

add styling to homepage