Template changes
merge conflicts
Started design, included logo
merge conflicts