first viersion of build
add testing and merges
backup
fix conflicts
add db
merge
continue nightly
almost finish models
begin mailler