initial commit of boilerplate and basic layout
merge resolution