Initial Commit of some existing work
conflict updates after creating github repo and pulling from origin