Aded basic framework stuff
t pu::Merge branch 'master' of https://github.com/jposton2/cs326