web app completed, styling to be complete
merging completed