added base dir
merge conflict resolved
added databuilder
added blog files