Initial Commit
Finishes framework for individuals to branch from
Initial Commit
intial commit

Finishes framework for individuals to branch from
fix merge conflict
Merge pull request #2 from thisismetis/dk-ap-jb-main-features

Dk ap jb main features