Just some merge and branching fixes.

Fixed some conflict issues in the code, as well as merged KrimCards branch over. KrimCards changes are also in here. They include the addition of a new style component library we will be making use of to give our site a common look and feel.

Thanks!